Jiang Jiang Jian
37a8c8ce6c
Merge branch 'bugfix/btdm_crash_when_esp_restart_v4.2' into 'release/v4.2'
...
components/bt: Fix crash in Bluetooth when esp_restart
See merge request espressif/esp-idf!12567
2021-03-05 12:27:43 +00:00
Jiang Jiang Jian
2289d4fcc0
Merge branch 'bugfix/fix_csa_channel_crash_v4.2' into 'release/v4.2'
...
esp_wifi: fix CSA and BAR crash issue(v4.2)
See merge request espressif/esp-idf!12549
2021-03-05 12:24:33 +00:00
Jiang Jiang Jian
e1f1d11b76
Merge branch 'feature/add_init_and_deinit_evt_for_a2dp_4_2' into 'release/v4.2'
...
feature/ Add A2DP Init and Deinit Complete Evt [backport v4.2]
See merge request espressif/esp-idf!12150
2021-03-05 12:19:18 +00:00
Aditya Patwardhan
a2ccb3c0ac
protocomm: Fixed NULL check of allocated memory
...
Fixes one part of - https://github.com/espressif/esp-idf/issues/6440
2021-03-05 10:06:18 +05:30
Aditya Patwardhan
a2e6db19e6
esp_tls: Fix misplaced paranthesis in esp_tls_mbedtls.c
...
Fixes one part of - https://github.com/espressif/esp-idf/issues/6440
2021-03-05 10:06:10 +05:30
Aditya Patwardhan
d66ad18853
Fix esp_tls: Prevent freeing of global ca store after each connection
...
when dynamic ssl buffers are enabled
2021-03-05 09:55:10 +05:30
Michael (XIAO Xufeng)
e7435a75f5
Merge branch 'bugfix/phy_xpd_v4.2' into 'release/v4.2'
...
wifi: add set_xpd_sar override(backport v4.2)
See merge request espressif/esp-idf!11540
2021-03-04 08:41:17 +00:00
Mahavir Jain
a177897f4d
log: correct timestamp formatting to unsigned integer type
...
Closes https://github.com/espressif/esp-idf/issues/6226
Closes IDFGH-4393
2021-03-04 11:54:30 +05:30
ChenJianxing
1f3b6b2e6d
esp_wifi: fix CSA and BAR crash issue.
2021-03-02 11:51:01 +08:00
baohongde
70de8f5158
components/bt: Fix crash in Bluetooth when esp_restart
2021-03-01 14:43:45 +08:00
Shubham Kulkarni
9689f87887
esp_wifi_deinit: Return ESP_ERR_WIFI_NOT_STOPPED if wifi is not stopped
...
Add test case to test this workflow
2021-02-26 14:53:59 +05:30
Angus Gratton
af8bc4c436
Merge branch 'bugfix/SECURE_DISABLE_ROM_DL_MODE_does_not_work_v4.2' into 'release/v4.2'
...
bootloader: SECURE_ENABLE_SECURE_ROM_DL_MODE cannot be y when SECURE_DISABLE_ROM_DL_MODE=y (v4.2)
See merge request espressif/esp-idf!12341
2021-02-24 09:40:44 +00:00
Michael (XIAO Xufeng)
c4fe55d42a
Revert "ci: temporarily disable RS485 related tests"
...
This reverts commit 983220e216ff7a16798e782eff84123c75a210f4
2021-02-23 11:00:37 +08:00
Michael (XIAO Xufeng)
e511dd58b3
Merge branch 'bugfix/freemodbus_fix_parity_propagation_issue_v42' into 'release/v4.2'
...
Bugfix/freemodbus fix parity propagation issue (Backport v4.2)
See merge request espressif/esp-idf!12389
2021-02-22 05:23:02 +00:00
Chinmay Chhajed
8455518127
component/bt: Added check for NULL valued combination key.
2021-02-18 06:12:17 +00:00
Chinmay Chhajed
24291f7a3b
Bluedroid: Do not initiate/accept connection with device having same BDADDR.
...
Added BD_ADDR comparison in l2cu_lcp_allocate and removed check from
security connection request handler as it's handled in l2cu_lcp_allocate
for both connection request and create connection.
2021-02-18 06:12:17 +00:00
Chinmay Chhajed
359509ccdc
bt: removed esp_bt_get_mac()
...
There was no need for this function as there is already a way present to
fetch own mac address. Own mac addr can be fetched by calling
controller_get_interface().
2021-02-18 06:12:17 +00:00
aleks
be68c0e8d8
freemodbus: fix mb controller parity propagation issues
...
Closes https://github.com/espressif/esp-idf/issues/6377
2021-02-17 12:40:34 +01: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
Yann Pomarède
4abc541d6f
bootloader: SECURE_ENABLE_SECURE_ROM_DL_MODE cannot be y when SECURE_DISABLE_ROM_DL_MODE=y
...
Closes: https://github.com/espressif/esp-idf/pull/6442
2021-02-09 16:34:30 +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
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
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
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
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
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 bf35ef1ce7b7db30d499d4058d6a4f39ba467fca.
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
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
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
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
weitianhua
186ebc61e7
Add init & deinit event for a2dp
2021-01-26 10:51:47 +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
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