Commit Graph

9921 Commits

Author SHA1 Message Date
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
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
David Čermák
504a9e178f Merge branch 'feature/mqtt_intro_new_modes_v3.3' into 'release/v3.3'
MQTT:  Update submodule reference to support new config modes (v3.3)

See merge request espressif/esp-idf!13712
2021-06-01 05:55:43 +00:00
Ivan Grokhotkov
c7add96e64 Merge branch 'bugfix/fix_idf_monitor_unicode_path_crash_v3.3' into 'release/v3.3'
tools: handle exception in case of logging Unicode characters (v3.3)

See merge request espressif/esp-idf!13045
2021-05-31 17:24:06 +00:00
David Cermak
4fce8182b9 MQTT: Update submodule reference to support new config modes
* Queueing publish messages to outbox when the client is not connected (default=off -> messages are queued if disconnected)
* Use of incremental msg-id instead of random id (default=off -> msg-id uses platform_random())
* Posting a new event-id if a queued message gets deleted from the outbox (default=off -> events are not posted)

Detailed description of included `esp-mqtt` changes
(da850b0add1e71b3659bfac5d797cc834dc3e89b...9ea804e0ab5368d5ab53ae2301a5fec9d1f12f1a)
* mqtt: Remove unused mqtt_header_state_t
  - esp-mqtt commit: b7158a4aea
  - esp-mqtt MR: espressif/esp-mqtt!84
  - Merges https://github.com/espressif/esp-mqtt/pull/180
* Cleanup public include dirs
  - esp-mqtt commit: f65d5d05db
  - esp-mqtt MR: espressif/esp-mqtt!85
* Config: Add a new option to use incremental message id
  - esp-mqtt commit: 8bb4a26f46
  - esp-mqtt MR: espressif/esp-mqtt!85
  - Closes https://github.com/espressif/esp-mqtt/issues/176
* Publish: Add new API to enqueue qos>0 messages
  - esp-mqtt commit: dc7fd5c0b1
  - esp-mqtt MR: espressif/esp-mqtt!85
  - Closes https://github.com/espressif/esp-mqtt/issues/155
* Config: Add a new option to disable publishing when disconnected
  - esp-mqtt commit: f44dcb1c26
  - esp-mqtt MR: espressif/esp-mqtt!85
  - Related https://github.com/espressif/esp-mqtt/issues/177
* Events: Add new event to report deleted messages from outbox
  - esp-mqtt commit: 2e35d4d4d5
  - esp-mqtt MR: espressif/esp-mqtt!85
* Publish: Allow for qos=0 messages to be stored using esp_mqtt_client_enqueue()
  - esp-mqtt commit: e2de0f3e3e
  - esp-mqtt MR: espressif/esp-mqtt!85
2021-05-31 13:04:18 +00:00
Yang Zhao
ea14555cf9 This issue is caused by modem sleep.The sleep interrupt will come the second time before the CLKN interrupt. If
we disable the sleep interrupt when it comes in the first time, the CLKN interrupt will never come.
2021-05-31 09:54:10 +00:00
Chinmay Chhajed
fb55f9f397 Bluedroid: Check only x component of passkey to avoid passkey impersonation attack. 2021-05-31 07:12:57 +00:00
David Čermák
5198a7a46b Merge branch 'bugfix/ensure_rmii_clock_before_phy_reset' into 'release/v3.3'
ethernet: ensure RMII clock before PHY reset

See merge request espressif/esp-idf!13714
2021-05-31 06:53:37 +00:00
Michael (XIAO Xufeng)
6aaddf972c Merge branch 'bugfix/fix_dac_driver_self_contained_backport_v3.3' into 'release/v3.3'
fix dac header file self contained issue (backport v3.3)

See merge request espressif/esp-idf!12890
2021-05-26 10:06:31 +00:00
Jiang Jiang Jian
0f80b6363c Merge branch 'nimble/fix_ble_sm_sc_pub_key_v3.3' into 'release/v3.3'
NimBLE: Fix MITM vulnerability and free AES context (v3.3)

See merge request espressif/esp-idf!13600
2021-05-26 04:10:41 +00:00
He Yin Ling
3bc41719ae Merge branch 'ci/ttfw_fix_dut_exception_not_added_to_junit_report_v3.3' into 'release/v3.3'
ttfw: fix DUT exception not added to junit report (v3.3)

See merge request espressif/esp-idf!13615
2021-05-26 03:13:53 +00:00
Prasad Alatkar
9f56c39630 NimBLE: Fix MITM vulnerability and free AES context (v3.3) 2021-05-25 14:55:00 +00:00
Jiang Jiang Jian
aacc7e07a6 Merge branch 'bugfix/fix_set_channel_error_after_wifi_stop_v3.3' into 'release/v3.3'
esp_wifi: Fix setting channel error after WiFi stop (backport v3.3)

See merge request espressif/esp-idf!13453
2021-05-25 14:29:07 +00:00
morris
fc60e09295 ethernet: ensure RMII clock before PHY reset
Closes https://github.com/espressif/esp-idf/issues/6821
2021-05-25 18:51:25 +08:00
David Čermák
d743f8502d Merge branch 'bugfix/mdns_coll_det_list' into 'release/v3.3'
mDNS: Fix of text length calculation when detecting a collision(Backport v3.3)

See merge request espressif/esp-idf!12026
2021-05-20 13:42:11 +00:00
suren.gabrielyan
c4ee49edf1 mDNS: Fix of text length calculation when detecting a collision 2021-05-20 11:05:51 +00:00
suren.gabrielyan
86f4afa330 mDNS: Fix of collision detection during txt length calculation
Closes https://github.com/espressif/esp-idf/issues/6114
2021-05-20 11:05:51 +00:00
He Yin Ling
0c2fb10e0c ttfw: fix DUT exception not added to junit report 2021-05-20 16:53:52 +08:00
Island
b3880ce487 Merge branch 'nimble/fix_host_flow_ctrl_v3.3' into 'release/v3.3'
NimBLE: Fix host flow control in NimBLE porting layer and host (release/v3.3)

See merge request espressif/esp-idf!13578
2021-05-19 09:51:10 +00:00
Prasad Alatkar
c15ecf9fcd NimBLE: Update submodule to include host flow control fixes. 2021-05-17 20:14:16 +05:30
Prasad Alatkar
3bdb0ce5c1 NimBLE: Fix host flow control in NimBLE porting layer.
- Register `ble_hs_flow_acl_free` callback in NimBLE porting layer.
2021-05-17 20:11:53 +05:30
Michael (XIAO Xufeng)
c0aee61ce0 Merge branch 'bugfix/fix_uart_module_enable_issue_v3.3' into 'release/v3.3'
Bugfix (uart): fix uart module reset issue (release V3.3)

See merge request espressif/esp-idf!8586
2021-05-13 06:55:15 +00:00
Jiang Jiang Jian
61a1e0d5c9 Merge branch 'bugfix/generate_value_0_when_prov_auth_v3.3' into 'release/v3.3'
ble_mesh: stack: Fix provisioning input or output count number should be at least 1 (v3.3)

See merge request espressif/esp-idf!13483
2021-05-08 12:53:48 +00:00
Jiang Jiang Jian
01cb29ba5a Merge branch 'bugfix/endianness_in_output_or_input_oob_v3.3' into 'release/v3.3'
ble_mesh: stack: Fix endianness error in output or input oob data of number (v3.3)

See merge request espressif/esp-idf!13470
2021-05-08 07:12:54 +00:00
wangjialiang
f24f7ab97b 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:19:03 +08:00
wangjialiang
e5f496149e ble_mesh: stack: Fix endianness error in output or input oob data of number
Closes https://github.com/espressif/esp-idf/issues/6862
2021-05-07 17:03:00 +08:00
Angus Gratton
fa00fd5c8a Merge branch 'bugfix/freertos_addition_overflow_v3.3' into 'release/v3.3'
freertos: Fix addition overflow (v3.3)

See merge request espressif/esp-idf!13426
2021-05-07 08:18:03 +00:00
xiehang
1a47ecbfac esp_wifi: Fix setting channel error after WiFi stop 2021-05-06 14:06:29 +08:00
Angus Gratton
542c3e07a0 freertos: Check for arithmetic overflows on queue creation
Addition overflow check is from FreeRTOS kernel commit 47338393f1f79558f6144213409f09f81d7c4837
2021-05-04 18:38:15 +10:00
Angus Gratton
9772facaca Merge branch 'bugfix/espsecure_args_v3.3' into 'release/v3.3'
esptool: Update to fix espsecure.py sign_data default version argument (v3.3)

See merge request espressif/esp-idf!13321
2021-05-03 08:57:42 +00:00
Angus Gratton
f845643608 esptool: Update to fix espsecure.py sign_data default version argument
Regression in Secure Boot signing, reported at https://github.com/espressif/esp-idf/issues/6831
2021-05-03 06:31:18 +00:00
Michael (XIAO Xufeng)
a040ec1eec Merge branch 'bugfix/put_uart_isr_in_iram_v3.3' into 'release/v3.3'
uart: add option to put ISR in IRAM (v3.3)

See merge request espressif/esp-idf!13144
2021-05-01 14:28:58 +00:00
Jiang Jiang Jian
6d44b690b8 Merge branch 'bugfix/remove_redundant_other_core_cache_disable_v3.3' into 'release/v3.3'
[system]: Remove redundant othercore cache disable (backport v3.3)

See merge request espressif/esp-idf!13360
2021-04-30 09:17:50 +00:00
Jiang Jiang Jian
ef7ae9a3ee Merge branch 'bugfix/wifi_softap_deep_sleep_current_opt_v3.3' into 'release/v3.3'
backport v3.3: optimize deep sleep current in wifi softap mode

See merge request espressif/esp-idf!13398
2021-04-30 02:50:33 +00:00
Li Shuai
e74a36da43 deep sleep: optimize sleep current in wifi softap mode 2021-04-29 15:43:00 +08:00
morris
dc9c0a9f6d uart: add option to put ISR in IRAM 2021-04-28 10:07:23 +00:00
Mahavir Jain
70cafac4bd Merge branch 'bugfix/esp_http_client_read_v3.3' into 'release/v3.3'
Fix esp_http_client_read for file size aligned to 289 bytes (v3.3)

See merge request espressif/esp-idf!13309
2021-04-28 10:03:47 +00:00
Shubham Kulkarni
c8996feebb esp_http_client_read: Add check for esp_http_client_is_complete_data_received before returning ESP_FAIL
Closes: https://github.com/espressif/esp-idf/issues/6772
2021-04-28 05:00:45 +00:00
houwenxiang
8fcca01384 driver(uart): fix uart module reset issue (release V3.3)
On ESP32, due to fifo reset issue, UART2 will work incorrectly if reset the fifo of UART1(TX fifo and RX fifo). The software can workaround the RX fifo reset issue,

    while the TX fifo reset issue can not. When UART2 is used and UART1 is used as the log output port, a software reset can reproduce this issue. So we should reset the UART memory

    before the software reset to solve this problem.
2021-04-27 10:12:59 +00:00
wuzhenghui
da31949530 remove othercore cache disable 2021-04-27 14:29:49 +08:00
Jiang Jiang Jian
0982de8c05 Merge branch 'bugfix/e8192_and_assert_param_v3.3' into 'release/v3.3'
Modify E8192 ELx200 ELx40 log level to LOGD

See merge request espressif/esp-idf!13170
2021-04-25 13:26:17 +00:00
xiongweichao
f11f52b72f modify E8192 ELx200 ELx40 log level to LOGD 2021-04-25 10:33:47 +00:00