zwj
c5afe0ea2d
fix vendor hci memory leak
2021-02-18 09:39:01 +00:00
Angus Gratton
ceb11fd543
Merge branch 'bugfix/cmake_example_sdkconfig_path_v4.2' into 'release/v4.2'
...
cmake/example: Move idf_as_lib sdkconfig path to project, document configuring project (v4.2)
See merge request espressif/esp-idf!10859
2021-02-17 22:45:21 +00:00
Mahavir Jain
391b2ebcf0
Merge branch 'bugfix/softap_prov_cookies_v4.2' into 'release/v4.2'
...
protocomm_httpd: Use HTTP cookies to track session (v4.2)
See merge request espressif/esp-idf!12265
2021-02-11 10:42:42 +08:00
Piyush Shah
d228fc826c
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-10 15:47:29 +05:30
Piyush Shah
328254c631
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-10 15:47:28 +05:30
Angus Gratton
2dd5a87cf1
Merge branch 'bugfix/websocket_example_error_handling_v4.2' into 'release/v4.2'
...
ci: Fix websocket example test error handling
See merge request espressif/esp-idf!11657
2021-02-10 15:51:32 +08:00
Island
1df0c17b98
Merge branch 'bugfix/ble_mesh_server_model_deinit_v4.2' into 'release/v4.2'
...
ble_mesh: stack: Fix deinit server models with no matching id (v4.2)
See merge request espressif/esp-idf!12314
2021-02-09 16:25:39 +08:00
Angus Gratton
660f41772c
ci: Fix websocket example test error handling
...
If connection fails for websocket test, a second exception was generated in
__exit__
2021-02-09 06:59:56 +00:00
Angus Gratton
ea476f1731
Merge branch 'bugfix/SECURE_ENABLE_SECURE_ROM_DL_MODE_v4.2' into 'release/v4.2'
...
bootloader: Fix warnings caused by security features (v4.2)
See merge request espressif/esp-idf!12286
2021-02-09 11:06:50 +08:00
lly
4070a6dc70
ble_mesh: stack: Fix deinit server models with no matching id
2021-02-07 11:18:31 +08:00
Jiang Jiang Jian
0ab739f72c
Merge branch 'bugfix/ble_mesh_wifi_coexit_example_v4.2' into 'release/v4.2'
...
bugfix: Delete local variables to avoid null global variables (backport v4.2)
See merge request espressif/esp-idf!11372
2021-02-05 20:21:58 +08:00
Island
3f46cb9789
Merge branch 'bugfix/ble_mesh_mbedtls_aes_fix_v4.2' into 'release/v4.2'
...
Bugfix/ble mesh mbedtls aes fix (v4.2)
See merge request espressif/esp-idf!12270
2021-02-05 14:46:00 +08:00
lly
c74c7fdb5a
ble_mesh: stack: Fix mbedtls aes ctx not deallocated
2021-02-05 03:26:26 +00:00
lly
02d3d358b5
ble_mesh: stack: Fix mbedtls aes ctx not initialized
2021-02-05 03:26:26 +00:00
Ivan Grokhotkov
74e1613b17
Merge branch 'bugfix/nvs_close_nukes_all_handles_v4.2' into 'release/v4.2'
...
NVS: fixed deinit other partition's handles (v4.2)
See merge request espressif/esp-idf!11497
2021-02-05 10:06:37 +08:00
Ivan Grokhotkov
89cab3140d
Merge branch 'bugfix/idf_monitor_baudrate_arg_crash_v4.2' into 'release/v4.2'
...
idf monitor: fix crash when monitor baudrate argument set (Backport v4.2)
See merge request espressif/esp-idf!9758
2021-02-05 10:06:07 +08:00
Mahavir Jain
040f5c8e0a
Merge branch 'bugfix/reenable_encrypted_partition_write_v4.2' into 'release/v4.2'
...
Re-enable encrypted flash read/writes even if flash encryption is disabled (v4.2)
See merge request espressif/esp-idf!12190
2021-02-05 01:05:04 +08:00
Mahavir Jain
aa3efa6cf1
Merge branch 'bugfix/protocomm_http_print_v4.2' into 'release/v4.2'
...
protocomm_httpd: Change an info print to debug print as it isn't really required in the logs (v4.2)
See merge request espressif/esp-idf!12261
2021-02-04 23:09:28 +08:00
KonstantinKondrashov
a8df2af065
bootloader: Fix warnings caused by security features
...
Closes: https://github.com/espressif/esp-idf/issues/6198
2021-02-04 22:24:25 +08:00
Piyush Shah
5c6b9d0625
protocomm_httpd: Change an info print to debug print as it isn't really required in the logs
2021-02-04 15:02:52 +05:30
Mahavir Jain
79aa9636b9
unit-test-app: disable encrypted flash read/write in psram config to fix build failure
2021-02-03 09:07:36 +00:00
Mahavir Jain
19b7705b8d
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-02-03 09:07:36 +00:00
Mahavir Jain
294fe8238c
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-02-03 09:07:36 +00:00
Michael (XIAO Xufeng)
0382c2e04e
Merge branch 'bugfix/mcpwm_can_set_two_falut_signal_v4.2' into 'release/v4.2'
...
mcpwm: fix second fault line broken issue (v4.2)
See merge request espressif/esp-idf!12171
2021-02-03 14:49:16 +08:00
Anton Maklakov
81680a633f
Merge branch 'bugfix/ttfw_idf_find_artifacts_inaccurate_with_same_prefix_path_v4.2' into 'release/v4.2'
...
CI: fix the bug returns wrong artifact path when app_name is a subset of a longer one (v4.2)
See merge request espressif/esp-idf!12228
2021-02-03 11:34:34 +08:00
David Čermák
6fd3557d99
Merge branch 'feature/support_transport_keepalive_v4.2' into 'release/v4.2'
...
Feature/support transport keepalive v4.2 [backport v4.2]
See merge request espressif/esp-idf!12157
2021-02-03 03:46:24 +08:00
Krzysztof Budzynski
f697f475e5
Merge branch 'doc/uart_num_fix_v4.2' into 'release/v4.2'
...
docs: fix uart number naming error (v4.2)
See merge request espressif/esp-idf!12068
2021-02-02 16:08:33 +08:00
Fu Hanxi
d9455d8587
CI: fix the bug returns wrong artifact path when app_name is a subset of a longer one
2021-02-02 11:14:06 +08:00
Mahavir Jain
2ea3519964
Merge branch 'bugfix/update_howsmyssl_cert_v4.2' into 'release/v4.2'
...
examples/protocols: update www.howsmyssl.com certificate to fix test failures (v4.2)
See merge request espressif/esp-idf!12211
2021-02-01 20:25:00 +08:00
Mahavir Jain
0dedf0e1f5
examples/protocols: update www.howsmyssl.com certificate to fix test failures
2021-02-01 11:01:35 +05:30
morris
48dc6e9347
mcpwm: fix second fault line broken
...
Closes: https://github.com/espressif/esp-idf/issues/6053
2021-01-27 14:56:33 +08:00
morris
87b051c87a
mcpwm: fix wrong capture edge
2021-01-27 14:56:33 +08:00
Michael (XIAO Xufeng)
10f16c5d72
Merge branch 'bugfix/soc_caps_implicit_inc_v4.2' into 'release/v4.2'
...
HAL: explicitly include soc_caps.h (v4.2)
See merge request espressif/esp-idf!11896
2021-01-27 10:33:42 +08:00
yuanjm
fd5f65a2d4
Make OTA example support keepalive
2021-01-26 14:09:13 +08:00
Shubham Kulkarni
90218b4e9b
Add options for esp_http_client and esp_websocket_client to support keepalive
2021-01-26 14:09:01 +08:00
yuanjm
cbca521e28
Modify esp-tls and tcp_transport to support keep alive for tcp and ssl connection
2021-01-26 14:08:45 +08:00
Mahavir Jain
c4d0a384b0
Merge branch 'fix/esp_tls_fix_memory_leak_v4.2' into 'release/v4.2'
...
Fix/esp tls fix memory leak v4.2
See merge request espressif/esp-idf!12085
2021-01-22 21:37:58 +08:00
Mahavir Jain
be26d45d78
Merge branch 'bugfix/httpd_session_close_lru_v4.2' into 'release/v4.2'
...
esp_http_server: Add flag in sock_db to identify httpd_sess_close is called from httpd_session_close_lru (v4.2)
See merge request espressif/esp-idf!12112
2021-01-22 21:22:11 +08:00
Shubham Kulkarni
6b054fb4a6
Enable lru_purge_enable in simple HTTP server example
2021-01-22 15:33:57 +05:30
Mahavir Jain
ecbf436de4
Merge branch 'bugfix/http_client_buffer_overread_v4.2' into 'release/v4.2'
...
esp_http_client: Fix buffer overread, update https_request example to use HTTP/1.1 (v4.2)
See merge request espressif/esp-idf!12108
2021-01-22 17:45:31 +08:00
Mahavir Jain
4d1ada8ab5
Merge branch 'bugfix/misc_secure_boot_v4.2' into 'release/v4.2'
...
Bugfix/misc secure boot v2 (v4.2)
See merge request espressif/esp-idf!11743
2021-01-22 16:27:10 +08:00
Shubham Kulkarni
1c732d7556
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:16:10 +05:30
Shubham Kulkarni
29feb17636
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:03:23 +05:30
Angus Gratton
7ceaac64bf
Merge branch 'bugfix/secure_boot_sig_failed_crash_v4.2' into 'release/v4.2'
...
secure boot: Fix crash if signature verification fails in app (v4.2)
See merge request espressif/esp-idf!11924
2021-01-22 07:58:24 +08:00
Aditya Patwardhan
84219fe844
esp_tls_wolfssl: Move order of crt_bundle check to match that in
...
esp_tls_mbedtls
2021-01-21 10:45:42 +05:30
Aditya Patwardhan
a5cf243ea0
esp-tls: Fix mem leak when global_ca_store is freed
2021-01-21 10:45:18 +05:30
Island
56de4bbc4d
Merge branch 'bugfix/ble_mesh_node_set_name_status_check_v4.2' into 'release/v4.2'
...
ble_mesh: stack: Remove node set device name return status check (v4.2)
See merge request espressif/esp-idf!12081
2021-01-21 11:07:58 +08:00
Island
7c9be015aa
Merge branch 'bugfix/ble_mesh_proxy_client_net_resend_v4.2' into 'release/v4.2'
...
ble_mesh: stack: Fix proxy client may fail to resend msg (v4.2)
See merge request espressif/esp-idf!12079
2021-01-21 11:07:27 +08:00
Island
54d8a1f76b
Merge branch 'bugfix/ble_mesh_prov_use_diff_rand_v4.2' into 'release/v4.2'
...
ble_mesh: stack: Use different random for each provisioning (v4.2)
See merge request espressif/esp-idf!12077
2021-01-21 11:07:02 +08:00
lly
4510332e96
ble_mesh: stack: Remove node set device name return status check
2021-01-20 21:11:21 +08:00