Jiang Jiang Jian
ee3e817a93
Merge branch 'ajust_espnow_channel_config_range_v3.3' into 'release/v3.3'
...
ajust espnow channel range
See merge request espressif/esp-idf!13685
2021-07-07 03:25:53 +00:00
Ivan Grokhotkov
789914a405
Merge branch 'bugfix/cmake_export_ver_during_reqs_expansion_v3.3' into 'release/v3.3'
...
cmake: set IDF_VERSION_* variables at requirement expansion stage (v3.3)
See merge request espressif/esp-idf!14047
2021-07-02 12:50:46 +00:00
Krzysztof Budzynski
81befb2330
Merge branch 'docs/windows_installer_2.9_backport_3.3' into 'release/v3.3'
...
docs: update Windows Tools 2.9 installation - backport 3.3
See merge request espressif/esp-idf!14193
2021-07-02 05:52:22 +00:00
Juraj Michálek
594d681aae
docs: update Windows Tools 2.9 installation
2021-06-30 12:51:12 +02:00
He Yin Ling
a6176fa73e
Merge branch 'test/merge_ble_mesh_node_and_provioner_in_console_v3.3' into 'release/v3.3'
...
Test:merge ble mesh node and provioner in console(backport v3.3)
See merge request espressif/esp-idf!9910
2021-06-30 06:14:43 +00:00
Lu Chang Jie
9dd12683e6
test: merge ble mesh node and provioner in console
2021-06-30 14:14:36 +08:00
Michael (XIAO Xufeng)
69af3d2a72
Merge branch 'bugfix/fix_adc-dma_reading_gap_for_esp32_backport_v3.3' into 'release/v3.3'
...
bugfix(adc): missing ranges of ADC codes in ESP32 (backport v3.3)
See merge request espressif/esp-idf!12876
2021-06-27 13:31:24 +00:00
Angus Gratton
a130da9e79
Merge branch 'feature/ci_release_zips_v3.3' into 'release/v3.3'
...
ci: Use GitHub Actions to generate recursive source code zips for releases (v3.3)
See merge request espressif/esp-idf!13203
2021-06-24 23:43:27 +00:00
Jiang Jiang Jian
b403b0dbd5
Merge branch 'bugfix/fix_amsdu_fragment_vulnerability_v3.3' into 'release/v3.3'
...
esp_wifi: fix amsdu & fragment vulnerabilities(v3.3)
See merge request espressif/esp-idf!14100
2021-06-24 09:50:38 +00:00
Mahavir Jain
557525eeb9
Merge branch 'bugfix/http_client_test_memcorupt_v3.3' into 'release/v3.3'
...
ci/test: Fix esp_http_client test not to use pointer after free (v3.3)
See merge request espressif/esp-idf!13706
2021-06-23 14:11:50 +00:00
Wang Meng Yang
26d8690525
Merge branch 'bugfix/ble_set_scan_param_error_v3.3' into 'release/v3.3'
...
Fix the bug when ble setting scan param
See merge request espressif/esp-idf!13980
2021-06-23 09:11:59 +00:00
Ivan Grokhotkov
cba17ebc0a
Merge branch 'feature/codeowners_v3.3' into 'release/v3.3'
...
add simplified CODEOWNERS file for older release branches (v3.3)
See merge request espressif/esp-idf!14094
2021-06-23 08:07:13 +00:00
David Cermak
1de77f5412
ci/test: Fix esp_http_client test not to use pointer after free
2021-06-23 08:39:42 +02:00
ChenJianxing
671ab9223c
esp_wifi: fix amsdu & fragment vulnerabilities
2021-06-22 20:48:37 +08:00
Ivan Grokhotkov
ec14f20421
add simplified CODEOWNERS file for older release branches
2021-06-22 09:23:52 +02:00
Angus Gratton
760ea137ee
Merge branch 'bugfix/driver_spi_poll_test_stack_v3.3' into 'release/v3.3'
...
driver test: Increase stack for the "spi poll tasks" test (v3.3)
See merge request espressif/esp-idf!13810
2021-06-22 04:14:08 +00:00
Krzysztof Budzynski
6e136860ae
Merge branch 'bugfix/make_docs_ldgen_v3.3' into 'release/v3.3'
...
docs: remove quotes in ldgen documentation for adding fragment file (v3.3)
See merge request espressif/esp-idf!14004
2021-06-22 03:28:03 +00:00
Anton Maklakov
6731c9daf3
Merge branch 'bugfix/iperf_basic_test_not_running' into 'release/v3.3'
...
CI: fix iperf basic test not running issue
See merge request espressif/esp-idf!13986
2021-06-22 03:19:42 +00:00
Island
708b72190f
Merge branch 'feat/ble_mesh_make_unprov_beacon_interval_configurable_v3.3' into 'release/v3.3'
...
Feat/ble mesh make unprov beacon interval configurable (v3.3)
See merge request espressif/esp-idf!14067
2021-06-21 11:39:57 +00:00
wangjialiang
411abfd70f
ble_mesh: stack: Fix crash for net_key_del when subnet is NULL
2021-06-21 14:57:17 +08:00
wangjialiang
84dd05439d
ble_mesh: stack: Make unprovisioned beacon interval configurable.
...
Closes https://github.com/espressif/esp-idf/issues/6722
2021-06-21 14:55:10 +08:00
Ivan Grokhotkov
b82577168a
cmake: set IDF_VERSION_* variables at requirement expansion stage
...
Currently IDF_VERSION_* variables are not available to the component
CMakeLists.txt files at the requirements expansion stage. This makes
it harder to write component CMakeLists files compatible with
different IDF versions.
Include version.cmake from the requirements expansion script, add a
build system test.
2021-06-18 15:37:34 +02:00
Island
f5fc806588
Merge branch 'bugfix/AuthValue_leak_v3.3' into 'release/v3.3'
...
ble_mesh: stack: Fix AuthValue Leak and Predictable AuthValue in Bluetooth... (v3.3)
See merge request espressif/esp-idf!14006
2021-06-18 09:02:29 +00:00
wangjialiang
35bbd1ba26
ble_mesh: stack: Fix AuthValue Leak and Predictable AuthValue in Bluetooth Mesh Provisioning Leads to MITM
2021-06-17 17:21:01 +08:00
Krzysztof
9d324fecb7
docs: remove quotes in ldgen documentation for adding fragment file
2021-06-17 10:07:04 +02:00
Island
b3827a4b74
Merge branch 'bugfix/impersonation_attacks_and_AuthValue_disclosure_v3.3' into 'release/v3.3'
...
ble_mesh: stack: Add check the value of Provisioning Random & Confirmation... (v3.3)
See merge request espressif/esp-idf!13928
2021-06-17 03:39:23 +00:00
wangjialiang
78676e7a02
ble_mesh: stack: Add check the value of Provisioning Random & Confirmation sent and received by provisioner
2021-06-16 21:28:10 +08:00
Chen Yudong
4f0ab9ee73
ci: fix iperf basic test not running issue
2021-06-16 15:49:08 +08:00
Yang Zhao
77c7d3be1c
bugfix:Set address resolution enable. If not set enable and the filter
...
policy is 2 or 3, the controller will reply with invalid param error.
2021-06-15 20:08:04 +08:00
He Yin Ling
1b076b5e42
Merge branch 'bugfix/python3_target_test_3.3' into 'release/v3.3'
...
CI: run target test with python3 (v3.3)
See merge request espressif/esp-idf!13460
2021-06-15 08:46:49 +00:00
Island
b65a37795f
Merge branch 'optimize/ble_mesh_miscellaneous_v3.3' into 'release/v3.3'
...
Optimize/ble mesh miscellaneous (v3.3)
See merge request espressif/esp-idf!13935
2021-06-10 09:21:49 +00:00
lly
9590db4cb6
ble_mesh: stack: Move bt_mesh_rand to mesh_common.c
2021-06-10 09:52:26 +08:00
lly
b2bcbd5559
ble_mesh: stack: Remove useless BT_DBG_ENABLED in a few files
2021-06-10 09:52:09 +08:00
lly
94ca8b8917
ble_mesh: Replace zephyr integer types with C99 types [Zephyr]
2021-06-10 09:51:52 +08:00
lly
85ec75b970
ble_mesh: stack: Update ARRAY_SIZE definition
2021-06-10 09:50:27 +08:00
Chen Yudong
a6fc744026
test: fix socket issue in iperf example test
2021-06-08 17:40:25 +08:00
He Yin Ling
35a7462e69
test: fix iperf example errors:
...
1. fix TypeError when running with python3
2. fix throughput chart x/y axis label error
3. make test case compatibile with iperf bin on earlier release branches
2021-06-08 17:40:14 +08:00
Chen Yudong
9703c1a32f
CI: fix connection failures in asio example tests
2021-06-08 17:40:04 +08:00
Chen Yudong
62359f3442
ci: run target test with python3
2021-06-08 17:39:29 +08:00
Angus Gratton
ac6f6a3768
Merge branch 'bugfix/cmake_partition_md5sum_v3.3' into 'release/v3.3'
...
bugfix: Fix CMake partition md5sum generation (v3.3)
See merge request espressif/esp-idf!13884
2021-06-08 04:46:10 +00:00
Angus Gratton
e2d6ce553d
cmake: partition_table: Fix generation of MD5 for partition table when using CMake
2021-06-07 17:59:12 +10:00
Island
cce139e5bd
Merge branch 'bugfix/bt_impersonation_passkey_fix_v3.3' into 'release/v3.3'
...
Bluedroid: Check only x component of passkey to avoid passkey impersonation attack. (v3.3)
See merge request espressif/esp-idf!13762
2021-06-07 06:41:48 +00:00
Angus Gratton
d7562e2b2c
driver test: Increase stack for the "spi poll tasks" test
...
Current stack usage gets very close to overflowing
2021-06-07 02:11:26 +00:00
Wang Meng Yang
c9cf530c51
Merge branch 'bugfix/invalid_feat_page_exec_v3.3' into 'release/v3.3'
...
bt controller: Fixed handling for invalid feature page.
See merge request espressif/esp-idf!13569
2021-06-07 01:35:22 +00:00
Angus Gratton
4e64cbb576
Merge branch 'bugfix/partition_table_integrity_check_v3.3' into 'release/v3.3'
...
paritition_table: Verify the partition table md5sum when loading in the app (v3.3)
See merge request espressif/esp-idf!13587
2021-06-04 08:26:21 +00:00
baohongde
bb824d7a4b
bugfix/fix crash when lmp flooding
2021-06-02 17:34:45 +08:00
baohongde
62a4a0dcaf
Delete the option BLE ADV priority high
...
Fix controller task watchdog in Wi-Fi test
2021-06-02 14:44:09 +08:00
Angus Gratton
22487a65ac
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:32:31 +10:00
gengyuchao
906dbd262e
Backport: Fixed handling for invalid feature page. Add missing IRAM_ATTR in coex mode.
2021-06-02 11:55:42 +08:00
Wang Meng Yang
f656c04d12
Merge branch 'bugfix/ble_timeout_disconnect_no_report_v3.3' into 'release/v3.3'
...
ble timeout disconnect but no report to host
See merge request espressif/esp-idf!13769
2021-06-02 02:51:17 +00:00