Commit Graph

11706 Commits

Author SHA1 Message Date
David Čermák
d7967133c8 Merge branch 'bugfix/start_emac_after_phy_reset_v4.0' into 'release/v4.0'
esp_eth: restart negotiation in esp_eth_start (v4.0)

See merge request espressif/esp-idf!13704
2021-07-02 12:51:13 +00:00
Ivan Grokhotkov
9a7de332f4 Merge branch 'bugfix/override_cmake_python_v4.0' into 'release/v4.0'
cmake: Minor Python CMake build fixes (v4.0)

See merge request espressif/esp-idf!13197
2021-07-02 12:32:46 +00:00
Ivan Grokhotkov
0f47e6b189 Merge branch 'feature/portmux_debug_bump_timeout_v4.0' into 'release/v4.0'
bugfix/freertos: increase portmux timeouts to avoid crashing when using debug feature (v4.0)

See merge request espressif/esp-idf!13750
2021-07-02 12:31:51 +00:00
Ivan Grokhotkov
714f1be6cc Merge branch 'bugfix/make_docs_ldgen_v4.0' into 'release/v4.0'
docs: remove quotes in ldgen documentation for adding fragment file (v4.0)

See merge request espressif/esp-idf!14003
2021-07-02 12:29:21 +00:00
Ivan Grokhotkov
69f43e4668 Merge branch 'bugfix/idf_tools_not_found_issue_v4.0' into 'release/v4.0'
tools: Catch OSError which is raised when the tool is not available (v4.0)

See merge request espressif/esp-idf!14136
2021-07-02 12:18:41 +00:00
Mahavir Jain
7b994feb13 Merge branch 'bugfix/http_client_test_memcorupt_v4.0' into 'release/v4.0'
ci/test: Fix esp_http_client test not to use pointer after free (v4.0)

See merge request espressif/esp-idf!13703
2021-07-02 12:17:59 +00:00
Wang Meng Yang
06ee358a09 Merge branch 'bugfix/fix_data_length_callback_param_err_v4.0' into 'release/v4.0'
Fixed data length update callback parameters error (back port v4.0)

See merge request espressif/esp-idf!14183
2021-07-02 12:16:31 +00:00
Wang Meng Yang
783bf67cbd Merge branch 'bugfix/spp_connect_20_fail_v4.0' into 'release/v4.0'
component_bt: fix spp acceptor deadlock

See merge request espressif/esp-idf!14108
2021-07-02 12:15:26 +00:00
Ivan Grokhotkov
a7d43619d9 Merge branch 'docs/windows_installer_2.9_backport_4.0' into 'release/v4.0'
docs: update Windows Tools 2.9 installation backport to v4.0

See merge request espressif/esp-idf!14192
2021-07-02 12:12:41 +00:00
Ivan Grokhotkov
6241eb8e06 Merge branch 'feature/ci_release_zips_v4.0' into 'release/v4.0'
ci: Use GitHub Actions to generate recursive source code zips for releases (v4.0)

See merge request espressif/esp-idf!13201
2021-07-02 12:12:08 +00:00
David Cermak
754a15890e ci/test: Fix esp_http_client test not to use pointer after free 2021-06-30 14:05:59 +02:00
Juraj Michálek
c28c933751 docs: update Windows Tools 2.9 installation 2021-06-30 11:21:24 +02:00
zwj
16e5b25c98 - fix data length update failed
- fix no callback when the value being used is the same as the value to be set
2021-06-29 14:16:03 +08:00
Jiang Jiang Jian
7504329ef9 Merge branch 'bugfix/fix_amsdu_fragment_vulnerability_v4.0' into 'release/v4.0'
esp_wifi: fix amsdu & fragment vulnerabilities(v4.0)

See merge request espressif/esp-idf!14101
2021-06-25 11:45:15 +00:00
Jiang Jiang Jian
c2f9002b03 Merge branch 'update/version_4_0_3' into 'release/v4.0'
Update version to 4.0.3

See merge request espressif/esp-idf!14141
2021-06-25 11:42:07 +00:00
ChenJianxing
f3f1190959 esp_wifi: fix amsdu & fragment vulnerabilities 2021-06-24 22:39:13 +08:00
Roland Dobai
d5d0c624d0 tools: Catch OSError which is raised when the tool is not available
Closes https://github.com/espressif/esp-idf/issues/7140
2021-06-24 12:04:08 +02:00
He Yin Ling
03fc307e21 versions: Update version to 4.0.3 2021-06-24 17:35:06 +08:00
Ivan Grokhotkov
b0097bb64f Merge branch 'feature/codeowners_v4.0' into 'release/v4.0'
add simplified CODEOWNERS file for older release branches (v4.0)

See merge request espressif/esp-idf!14093
2021-06-23 08:08:35 +00:00
xiongweichao
8a45db1a7a fix spp acceptor deadlock 2021-06-23 11:12:59 +08:00
Ivan Grokhotkov
57a9782f8b add simplified CODEOWNERS file for older release branches 2021-06-22 09:23:33 +02: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
Renz Bagaporo
081d0d5225 docs: remove quotes in ldgen documentation for adding fragment file
Closes https://github.com/espressif/esp-idf/issues/5142
2021-06-17 09:14:02 +02: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
Felipe Neves
e29da11f6b freertos/portmux: increase portmux timeouts to avoid crashing when using debug feature
Closes: https://github.com/espressif/esp-idf/issues/3629#
2021-05-28 09:52:26 +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
morris
7ab8594813 esp_eth: restart negotiation in esp_eth_start 2021-05-25 15:31:53 +08:00
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
Angus Gratton
0425b2e7b5 cmake: Improve the error message if the Python interpreter fails to run
RESULT_VARIABLE will return a string not a number in this case, so display it
for the user.
2021-05-12 00:35:15 +00:00
Angus Gratton
262323e740 cmake: Set IDFTOOL variable using the correct PYTHON interpreter variable 2021-05-12 00:35:15 +00:00
Angus Gratton
632796887e cmake: Fix passing PYTHON path via CMake variable if using IDF as library
Closes https://github.com/espressif/esp-idf/issues/6285
2021-05-12 00:35:15 +00:00
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