Commit Graph

11655 Commits

Author SHA1 Message Date
Piyush Shah
f132cf2b8b protocomm security1: Restart security session if SESSION_STATE_CMD0 is received
With the introduction of cookies to track a session, it is possible that the
clients restart the provisioning on the same session, specifically when a user
cancels a current provisioning attempt. This can result in an error as the state
on the device side and client side will go out of sync.

This has now been changed such that if SESSION_STATE_CMD0 is received on
an existing session, the state is reset and flow allowed to continue.
2021-02-05 14:28:45 +05:30
Piyush Shah
7755d3955f protocomm_httpd: Use HTTP cookies to track session
Earlier, a "socket connection" was being considered as a protocomm "session".
However, for HTTP, we cannot expect clients to necessarily use the same
socket for all requests of a given transaction. This was indeed causing
some failures for Wi-Fi provisioning from Android phones.

So, we have introduced http cookies to track a session even if the socket
connection does not stay intact throughout the transaction.
This change is backward compatible. If the client does not use cookies, the
socket connection will be considered as the session.

Closes: https://github.com/espressif/esp-idf/issues/6316
Reference: https://github.com/espressif/esp-idf/pull/6330
2021-02-05 14:28:45 +05:30
Island
22688745f6 Merge branch 'bugfix/ble_mesh_mbedtls_aes_fix_v4.0' into 'release/v4.0'
Bugfix/ble mesh mbedtls aes fix (v4.0)

See merge request espressif/esp-idf!12271
2021-02-05 14:46:08 +08:00
lly
d94289c83a ble_mesh: stack: Fix mbedtls aes ctx not deallocated 2021-02-05 03:26:49 +00:00
lly
574958367f ble_mesh: stack: Fix mbedtls aes ctx not initialized 2021-02-05 03:26:49 +00:00
Ivan Grokhotkov
5dd22738d6 Merge branch 'bugfix/esp_pm_dump_critical_v4.0' into 'release/v4.0'
esp_pm: esp_pm_dump_locks: don't print from a critical section, and fix formatting (backport v4.0)

See merge request espressif/esp-idf!12019
2021-02-05 09:52:40 +08:00
Michael (XIAO Xufeng)
2a7aaacec6 Merge branch 'spi_dma_close_before_cpu_reset_v4.0' into 'release/v4.0'
spi: fix issue with closing DMA before CPU reset (4.0)

See merge request espressif/esp-idf!10840
2021-02-05 00:52:09 +08:00
Mahavir Jain
1b5d2bf66e Merge branch 'bugfix/protocomm_http_print_v4.0' into 'release/v4.0'
protocomm_httpd: Change an info print to debug print as it isn't really required in the logs (v4.0)

See merge request espressif/esp-idf!12263
2021-02-04 20:51:19 +08:00
weitianhua
ebe344f852 Fix A2DP Underrun Issue 2021-02-04 19:35:19 +08:00
dongyou
5d83b9c2b0 add exception handling for iperf example's scan when no ap was found 2021-02-04 17:52:37 +08:00
Piyush Shah
948ec32caf protocomm_httpd: Change an info print to debug print as it isn't really required in the logs 2021-02-04 15:05:22 +05:30
dongyou
509ff013bd fix smartconfig issue when router reply arp late 2021-02-04 11:40:05 +08:00
Anton Maklakov
43127a5084 Merge branch 'bugfix/ttfw_idf_find_artifacts_inaccurate_with_same_prefix_path_v4.0' into 'release/v4.0'
CI: fix the bug returns wrong artifact path when app_name is a subset of a longer one (v4.0)

See merge request espressif/esp-idf!12230
2021-02-03 11:34:30 +08:00
David Čermák
a6bddd68d2 Merge branch 'feature/support_transport_keepalive_v4.0' into 'release/v4.0'
Feature/support transport keepalive v4.0 [backport v4.0]

See merge request espressif/esp-idf!12155
2021-02-02 22:00:53 +08:00
Mahavir Jain
e454fdb8fc Merge branch 'bugfix/reenable_encrypted_partition_write_v4.0' into 'release/v4.0'
Re-enable encrypted flash read/writes even if flash encryption is disabled (v4.0)

See merge request espressif/esp-idf!12192
2021-02-02 18:30:27 +08:00
Fu Hanxi
f39d69b592 CI: fix the bug returns wrong artifact path when app_name is a subset of a longer one 2021-02-02 11:14:28 +08:00
Mahavir Jain
7b60b944b1 Merge branch 'bugfix/update_howsmyssl_cert_v4.0' into 'release/v4.0'
examples/protocols: update www.howsmyssl.com certificate to fix test failures (v4.0)

See merge request espressif/esp-idf!12213
2021-02-01 18:18:29 +08:00
Mahavir Jain
ae1aef7b9e examples/protocols: update www.howsmyssl.com certificate to fix test failures 2021-02-01 11:10:38 +05:30
Mahavir Jain
544a2a4f4e unit-test-app: disable encrypted flash read/write in psram config to fix build failure 2021-01-29 11:45:51 +05:30
Mahavir Jain
d82adb482b spi_flash: add config option to enable encrypted partition read/write
This feature can be disabled to save some IRAM (approx 1KB) for cases
where flash encryption feature is not required.
2021-01-29 11:45:50 +05:30
Mahavir Jain
9c169a1812 Revert "esp_partition: disable encrypted reads/writes if flash encryption is disabled"
This reverts commit bf35ef1ce7.

It has been noticed that there are scenarios where even though firmware is not enabled
with flash encryption config feature, it should be able to write to encrypted partitions.

This revert adds the feature back which was removed around v4.0 timelines, and same
change will be backported to all releases (upto v4.0) for consistency.
2021-01-29 11:45:50 +05:30
xiehang
e9de533c81 esp_wifi: Modify WIFI_IF_AP to TCPIP_ADAPTER_IF_AP 2021-01-27 15:00:55 +08:00
xiehang
041ad04fdd esp_wifi: Modify ESP_IF_WIFI_AP to WIFI_IF_AP 2021-01-27 15:00:51 +08:00
xiehang
4c68212c8f esp_wifi: Modify ESP_IF_WIFI_STA to WIFI_IF_STA 2021-01-27 14:59:25 +08:00
weitianhua
1ae261dcdd Add init & deinit event for a2dp 2021-01-26 10:54:15 +08:00
yuanjm
9ada8df5c0 Make OTA example support keepalive 2021-01-25 21:01:31 +08:00
Shubham Kulkarni
985de73e6d Add options for esp_http_client and esp_websocket_client to support keepalive 2021-01-25 21:01:30 +08:00
yuanjm
7201411f49 Modify esp-tls and tcp_transport to support keep alive for tcp and ssl connection 2021-01-25 21:01:25 +08:00
Michael (XIAO Xufeng)
8e8e54737d Merge branch 'bugfix/modbus_fix_slave_id_support_v40' into 'release/v4.0'
Bugfix/modbus fix slave id support v40

See merge request espressif/esp-idf!12096
2021-01-25 12:23:57 +08:00
Mahavir Jain
4b50c99957 Merge branch 'bugfix/httpd_session_close_lru_v4.0' into 'release/v4.0'
esp_http_server: Add flag in sock_db to identify httpd_sess_close is called from httpd_session_close_lru (v4.0)

See merge request espressif/esp-idf!12114
2021-01-22 21:26:29 +08:00
Mahavir Jain
7d677373e1 Merge branch 'bugfix/http_client_buffer_overread_v4.0' into 'release/v4.0'
esp_http_client: Fix buffer overread, update https_request example to use HTTP/1.1 (v4.0)

See merge request espressif/esp-idf!12110
2021-01-22 18:08:49 +08:00
Shubham Kulkarni
1c10469890 Enable lru_purge_enable in simple HTTP server example 2021-01-22 15:35:46 +05:30
Mahavir Jain
5d490dbc1e Merge branch 'fix/esp_tls_fix_memory_leak_v4.0' into 'release/v4.0'
esp-tls: Fix mem leak when global_ca_store is freed

See merge request espressif/esp-idf!12087
2021-01-22 17:37:32 +08:00
Shubham Kulkarni
9951421910 esp_http_server: Add lru_socket flag in sock_db to indicate httpd_sess_close is called from httpd_sess_close_lru 2021-01-22 11:17:17 +05:30
Shubham Kulkarni
d0a4d91838 esp_http_client.c: Clear raw_len for response buffer after dispatching HTTP_EVENT_ON_FINISH event
Closes: https://github.com/espressif/esp-idf/issues/6146
2021-01-22 11:04:11 +05:30
aleks
4f7f09a64f freemodbus: fix compilation issue when slave id support is enabled
Closes https://github.com/espressif/esp-idf/issues/6003
2021-01-21 18:50:39 +01:00
Aditya Patwardhan
4df95abb22 esp-tls: Fix mem leak when global_ca_store is freed 2021-01-21 11:31:52 +05:30
Island
38ea44faaf Merge branch 'bugfix/ble_mesh_node_set_name_status_check_v4.0' into 'release/v4.0'
ble_mesh: stack: Remove node set device name return status check (v4.0)

See merge request espressif/esp-idf!12082
2021-01-21 11:08:02 +08:00
Island
9f78bcc36d Merge branch 'bugfix/ble_mesh_proxy_client_net_resend_v4.0' into 'release/v4.0'
ble_mesh: stack: Fix proxy client may fail to resend msg (v4.0)

See merge request espressif/esp-idf!12080
2021-01-21 11:07:41 +08:00
Island
ffc0f59565 Merge branch 'bugfix/ble_mesh_prov_use_diff_rand_v4.0' into 'release/v4.0'
ble_mesh: stack: Use different random for each provisioning (v4.0)

See merge request espressif/esp-idf!12078
2021-01-21 11:07:26 +08:00
lly
9d4abeb907 ble_mesh: stack: Remove node set device name return status check 2021-01-20 21:11:33 +08:00
lly
4c86bec0e9 ble_mesh: stack: Fix proxy client may fail to resend msg 2021-01-20 21:10:30 +08:00
lly
8737392af0 ble_mesh: stack: Use different random for each provisioning 2021-01-20 21:09:28 +08:00
David Čermák
b1178d092e Merge branch 'bugfix/mdns_txt_length_collision_v4.0' into 'release/v4.0'
mDNS: Fix of text length calculation when detecting a collision(Backport v4.0)

See merge request espressif/esp-idf!12027
2021-01-19 22:16:08 +08:00
Jiang Jiang Jian
a61ec41740 Merge branch 'bugfix/btdm_blufi_send_custom_data_will_congested_after_connection_is_broken_v4.0' into 'release/v4.0'
component/bt: fix Blufi sends customer data will congested when connection is broken(backport v4.0)

See merge request espressif/esp-idf!11849
2021-01-19 21:44:35 +08:00
Island
c23c45a12a Merge branch 'bugfix/ble_mesh_log_macro_v4.0' into 'release/v4.0'
ble_mesh: stack: Add prefix for log macros (v4.0)

See merge request espressif/esp-idf!12053
2021-01-19 17:34:26 +08:00
Angus Gratton
c26e20770d Merge branch 'bugfix/soc_cpu_signed_compare_v4_0_pr5687' into 'release/v4.0'
fix compiler warning: comparison of integer expressions of different...

See merge request espressif/esp-idf!12049
2021-01-19 15:46:30 +08:00
Angus Gratton
7c204c38dd Merge branch 'bugfix/idf_py_disable_cmake_warnings_default_v4.0' into 'release/v4.0'
idf.py: disable cmake uninitialized variable warnings by default (v4.0)

See merge request espressif/esp-idf!10203
2021-01-19 14:21:50 +08:00
lly
421f044eea ble_mesh: stack: Fix compile warning when log is disabled 2021-01-19 14:05:25 +08:00
lly
3e5d2b9c41 ble_mesh: ci: Add disable log sdkconfig test files 2021-01-19 14:05:25 +08:00