Commit Graph

11679 Commits

Author SHA1 Message Date
xiongweichao
8a45db1a7a fix spp acceptor deadlock 2021-06-23 11:12:59 +08:00
Island
ee8c27e5e3 Merge branch 'bugfix/AuthValue_leak_v4.0' into 'release/v4.0'
ble_mesh: stack: Fix AuthValue Leak and Predictable AuthValue in Bluetooth... (v4.0)

See merge request espressif/esp-idf!14005
2021-06-18 03:47:47 +00:00
wangjialiang
6ba3ae339b ble_mesh: stack: Fix AuthValue Leak and Predictable AuthValue in Bluetooth Mesh Provisioning Leads to MITM 2021-06-17 16:53:07 +08:00
Island
3ea9deff82 Merge branch 'bugfix/impersonation_attacks_and_AuthValue_disclosure_v4.0' into 'release/v4.0'
ble_mesh: stack: Add check the value of Provisioning Random & Confirmation... (v4.0)

See merge request espressif/esp-idf!13924
2021-06-17 07:38:45 +00:00
wangjialiang
f9b2bba5a4 ble_mesh: stack: Add check the value of Provisioning Random & Confirmation sent and received by provisioner 2021-06-16 21:28:52 +08:00
Island
577aef29ad Merge branch 'bugfix/btdm_enable_gattc_cache_will_crash_v4.0' into 'release/v4.0'
component/bt: fix enable gattc nvs cache lead to crash

See merge request espressif/esp-idf!13916
2021-06-10 02:56:25 +00:00
Island
8ca5068f20 Merge branch 'bugfix/bt_impersonation_passkey_fix_v4.0' into 'release/v4.0'
Bluedroid: Check only x component of passkey to avoid passkey impersonation attack. (v4.0)

See merge request espressif/esp-idf!13898
2021-06-09 06:32:42 +00:00
Chinmay Chhajed
e42479e129 Bluedroid: Check only x component of passkey to avoid passkey impersonation attack. 2021-06-08 10:09:21 +05:30
xiewenxiang
3892a92d80 component/bt: fix enable gattc nvs cache lead to crash 2021-06-07 18:03:19 +08:00
Angus Gratton
bdbfdcdf5c Merge branch 'bugfix/partition_table_integrity_check_v4.0' into 'release/v4.0'
paritition_table: Verify the partition table md5sum when loading in the app (v4.0)

See merge request espressif/esp-idf!13586
2021-06-03 02:14:28 +00:00
Angus Gratton
c572e0bf5f paritition_table: Verify the partition table md5sum when loading the app
Additionally, always enable the partition MD5 check if flash encryption is on in
Release mode. This ensures the partition table ciphertext has not been modified
(CVE-2021-27926).

The exception is pre-V3.1 ESP-IDF bootloaders and partition tables, which
don't have support for the MD5 entry.
2021-06-02 16:30:02 +10:00
He Yin Ling
b23f8e21cd Merge branch 'ci/ttfw_fix_dut_exception_not_added_to_junit_report_v4.0' into 'release/v4.0'
ttfw: fix DUT exception not added to junit report (v4.0)

See merge request espressif/esp-idf!13614
2021-05-26 03:12:41 +00:00
Jiang Jiang Jian
1a415f3e31 Merge branch 'nimble/fix_ble_sm_sc_pub_key_v4.0' into 'release/v4.0'
NimBLE: Fix MITM vulnerability and free AES context (v4.0)

See merge request espressif/esp-idf!13599
2021-05-25 14:27:33 +00:00
Prasad Alatkar
fc9f2e8782 NimBLE: Fix MITM vulnerability and free AES context (v4.0) 2021-05-25 14:57:37 +05:30
He Yin Ling
091681faec ttfw: fix DUT exception not added to junit report 2021-05-20 16:57:06 +08:00
Island
532d0a72c3 Merge branch 'nimble/fix_host_flow_ctrl_v4.0' into 'release/v4.0'
NimBLE: Fix host flow control in NimBLE porting layer and host (release/v4.0)

See merge request espressif/esp-idf!13577
2021-05-19 09:50:27 +00:00
Angus Gratton
51623fd4ce Merge branch 'feature/oocd_ver_backport_v4.0' into 'release/v4.0'
Feature/oocd ver backport v4.0

See merge request espressif/esp-idf!11378
2021-05-19 07:57:38 +00:00
Angus Gratton
0242438e9d Merge branch 'bugfix/setjmp_longjmp_4.0' into 'release/v4.0'
[system]: Made longjmp save for context switch (backport v4.0)

See merge request espressif/esp-idf!13503
2021-05-19 01:39:51 +00:00
Prasad Alatkar
e123d89625 NimBLE: Update submodule to fix host flow control bugs. 2021-05-18 19:01:28 +05:30
Prasad Alatkar
b57b6f1adb NimBLE: Fix host flow control in NimBLE porting layer.
- Register `ble_hs_flow_acl_free` callback in NimBLE porting layer.
2021-05-17 20:01:17 +05:30
He Yin Ling
4ba4b5780e Merge branch 'bugfix/python3_target_test_4.0' into 'release/v4.0'
ci: using python3 to tun target test (4.0)

See merge request espressif/esp-idf!13241
2021-05-11 09:15:18 +00:00
Alexey Gerenkov
0d99d2a1a1 tools: Updates OpenOCD version to 'v0.10.0-esp32-20210401' 2021-05-10 16:23:48 +00:00
Jakob Hasse
19eab31660 [system]: Made longjmp save for context switch
* Patched longjmp to be context-switch safe
  longjmp modifies the windowbase and windowstart
  registers, which isn't safe if a context switch
  occurs during the modification. After a context
  switch, windowstart and windowbase will be
  different, leading to a wrongly set windowstart
  bit due to longjmp writing it based on the
  windowbase before the context switch. This
  corrupts the registers at the next window
  overflow reaching that wrongly set bit.

  The solution is to disable interrupts during
  this code. It is only 6 instructions long,
  the impact shouldn't be significant.

  The fix is implemented as a wrapper which
  replaces the original first instructions of
  longjmp which are buggy. Then, it jumps back
  to execute the rest of the original longjmp
  function.

  Added a comparably reliable test to the
  test apps.
2021-05-10 19:21:56 +08:00
Jiang Jiang Jian
fa1f7e112c Merge branch 'feature/twdt_prints_backtrace_v4.0' into 'release/v4.0'
Add Task Watchdog backtrace printing (v4.0)

See merge request espressif/esp-idf!12618
2021-05-10 09:47:28 +00:00
Jiang Jiang Jian
f5c4e5e7d2 Merge branch 'bugfix/gtk_reinstallation_fix_v4.0' into 'release/v4.0'
wpa_supplicant: Prevent reinstallation of an already in-use group key (v4.0)

See merge request espressif/esp-idf!13184
2021-05-10 08:33:46 +00:00
Jiang Jiang Jian
ce99b662c2 Merge branch 'bugfix/freemodbus_fix_event_processing_after_destroy_backport40' into 'release/v4.0'
freemodbus: fix event processing failure after destroy (backport v4.0)

See merge request espressif/esp-idf!9323
2021-05-10 08:30:45 +00:00
aleks
940e108c4b freemodbus: fix event processing failure after destroy
Closes https://github.com/espressif/esp-idf/issues/5275
2021-05-10 08:43:42 +02:00
Kapil Gupta
39a3d1df8e wpa_supplicant: Group key reinstallation fixes
This commit reverts previous commit for GTK reinstallation fix
and corrects original fix.
2021-05-10 11:22:01 +05:30
Kapil Gupta
c5f0a609c8 wpa_supplicant: Prevent reinstallation of an already in-use group key 2021-05-10 11:22:01 +05:30
Jiang Jiang Jian
1ce0d7bcf4 Merge branch 'bugfix/scheduler_start_iram_v4.0' into 'release/v4.0'
freertos: move some of the initialization functions out of IRAM (v4.0)

See merge request espressif/esp-idf!11222
2021-05-10 04:36:16 +00:00
Jiang Jiang Jian
dba7cab2d9 Merge branch 'bugfix/spi_fix_duplex_switch_v4.0' into 'release/v4.0'
spi_master: fix duplex mode switch issue for multi devices (4.0)

See merge request espressif/esp-idf!11235
2021-05-10 04:13:28 +00:00
Jiang Jiang Jian
6b294bac4c Merge branch 'bugfix/fix_set_channel_error_after_wifi_stop_v4.0' into 'release/v4.0'
esp_wifi: Fix setting channel error after WiFi stop ( backport v4.0)

See merge request espressif/esp-idf!13452
2021-05-10 03:18:32 +00:00
Jiang Jiang Jian
66b2b5f45c Merge branch 'feature/nvs_allow_custom_part_4.0' into 'release/v4.0'
Feature/nvs allow custom part 4.0

See merge request espressif/esp-idf!9519
2021-05-10 03:13:47 +00:00
Darian Leung
29d6823d2f Add Task Watchdog backtrace printing
This commit makes the Task Watchdog print the backtrace of both
cores when it times out.
2021-05-10 03:09:20 +00:00
Jiang Jiang Jian
676905709a Merge branch 'bugfix/fix_uart_module_enable_issue_4.0' into 'release/v4.0'
driver(uart): fix uart module reset issue (release V4.0)

See merge request espressif/esp-idf!11971
2021-05-10 03:07:41 +00:00
Jiang Jiang Jian
b89b1ec022 Merge branch 'bugfix/ble_timeout_disconnected_no_report_v4.0' into 'release/v4.0'
Fix the issue that the controller do not report the timeout disconnect event

See merge request espressif/esp-idf!13468
2021-05-10 03:03:58 +00:00
Jiang Jiang Jian
763aa66036 Merge branch 'bugfix/generate_value_0_when_prov_auth_v4.0' into 'release/v4.0'
ble_mesh: stack: Fix provisioning input or output count number should be at least 1 (v4.0)

See merge request espressif/esp-idf!13482
2021-05-08 12:54:53 +00:00
ChenJianxing
4a24cb7d8f esp_wifi: fix some wifi bugs
1. Fix setting channel error after WiFi stop
2. Fixed issue of reason code change from 15 to 204 when provide wrong password
3. Fix set config return value error
4. Fix ampdu age timer memory leak
5. Add beacon timeout event
6. Ignore dirtyBuf check when buffer size is larger than 4092
7. Fix SoftAP not initiating 4-way handshake if max length passphrase is set
8. Fix esptouch find hidden AP fail
9. Clear AP Bss when auth timeout happens.
10.Fix not connect to open AP when WPA3 auth fail.
11.Fix esp_wifi_80211_tx when out of memory unlock mutex issue.
12.Fix esp_wifi_80211_tx can't be used in ap mode
13.Fix hidden AP scans after connecting AP
14.Fix watchdog happens when receiving action frame
2021-05-08 19:55:00 +08:00
Jiang Jiang Jian
9ee19a35b8 Merge branch 'bugfix/spp_data_send_delay_v4.0' into 'release/v4.0'
Bugfix/spp data send delay v4.0

See merge request espressif/esp-idf!11774
2021-05-08 09:47:23 +00:00
Jiang Jiang Jian
3907e8a067 Merge branch 'bugfix/bta_hf_client_sco_co_out_data_v4.0' into 'release/v4.0'
bugfix/if bta_hf_client_sco_co_out_data is called, it will crash when sco disconnected [backport v4.0]

See merge request espressif/esp-idf!12558
2021-05-08 07:28:38 +00:00
Jiang Jiang Jian
5c0b14e167 Merge branch 'bugfix/btdm_fix_multi-con_pair_failed_and_cancle_con_state_err_v4.0' into 'release/v4.0'
fix multi con pair failed and cancel con state error (backport v4.0)

See merge request espressif/esp-idf!13477
2021-05-08 07:28:10 +00:00
Jiang Jiang Jian
970dc8cf80 Merge branch 'mesh/esp_mesh_send_block_time_v4.0' into 'release/v4.0'
esp_wifi_mesh: add esp_mesh_send_block_time to set blocking time of esp_mesh_send(backport v4.0)

See merge request espressif/esp-idf!13411
2021-05-08 07:05:53 +00:00
baohongde
09e665770f components/bt: Add API to config QoS 2021-05-08 06:05:50 +00:00
baohongde
e1c9aafd46 components/bt: Add QOS for SPP, to decrease the delay from slave to master 2021-05-08 06:05:50 +00:00
wangjialiang
6826f9dbba ble_mesh: stack: Fix provisioning input or output count number should be at least 1
Closes https://github.com/espressif/esp-idf/issues/6863
2021-05-08 13:13:58 +08:00
zwj
eb9841e769 update con state when getting connection cancle complete 2021-05-08 03:42:02 +00:00
zwj
84df41cdf0 fix multi-connection pair failed 2021-05-08 03:42:02 +00:00
Jiang Jiang Jian
d4970113af Merge branch 'example/aligenie_v4.0' into 'release/v4.0'
ble_mesh: add aligenie ble mesh example (backport V4.0)

See merge request espressif/esp-idf!11402
2021-05-08 03:17:31 +00:00
InfiniteYuan
89bff63443 ble mesh: add aligenie ble mesh example 2021-05-08 01:57:48 +00:00
liaowenhao
acbcf13ee5 bugfix/if bta_hf_client_sco_co_out_data is called, it will crash when sco disconnected 2021-05-07 23:23:38 +00:00