morris
47fee134d3
Merge branch 'fix/uart_is_enable_check_error_on_s3_v6.1' into 'release/v6.1'
...
Fix ESP32-S3 uart2 is_enabled check error (v6.1)
See merge request espressif/esp-idf!49338
2026-06-12 10:23:02 +08:00
morris
0ce7e37fe4
Merge branch 'fix/adc_monitor_error_on_ch8_9_on_s3_v6.1' into 'release/v6.1'
...
Fix ADC Continuous Monitor Callback Failure for ADC1 Channels 8/9 on ESP32-S3 (v6.1)
See merge request espressif/esp-idf!49504
2026-06-12 10:22:31 +08:00
Mahavir Jain
0af956f7af
Merge branch 'fix/https-redirect-downgrade_v6.1' into 'release/v6.1'
...
fix(esp_http_client): block HTTPS-to-HTTP redirect downgrade (v6.1)
See merge request espressif/esp-idf!48978
2026-06-11 12:06:21 +05:30
Mahavir Jain
7678f3570d
Merge branch 'feat/adds_ds_qemu_test_v6.1' into 'release/v6.1'
...
feat: adds mutual auth example (v6.1)
See merge request espressif/esp-idf!49340
2026-06-11 10:26:59 +05:30
Mahavir Jain
f33e625ba0
Merge branch 'feat/fix_ws_server_httpd_queue_work_silent_drop_v6.1' into 'release/v6.1'
...
fix(esp_http_server): prevent silent message drop in httpd_queue_work (v6.1)
See merge request espressif/esp-idf!49348
2026-06-11 10:26:10 +05:30
Mahavir Jain
b621b5055a
Merge branch 'contrib/github_pr_18641_v6.1' into 'release/v6.1'
...
fix(protocomm): prevent out-of-bounds write in console line buffer (GitHub PR) (v6.1)
See merge request espressif/esp-idf!49342
2026-06-11 10:25:26 +05:30
morris
13ae5057df
Merge branch 'fix/fix_rgb_gdma_link_switch_v6.1' into 'release/v6.1'
...
fix(rgb_lcd): fix gdma link switch not take effect (v6.1)
See merge request espressif/esp-idf!49544
2026-06-11 10:16:19 +08:00
Chen Jichang
cb5da9aecf
fix(rgb_lcd): fix gdma link switch not take effect
2026-06-10 20:07:39 +08:00
Mahavir Jain
a96553ed75
Merge branch 'fix/esp_tee_bbp_v6.1' into 'release/v6.1'
...
fix(esp_tee): Harden TEE secure services against REE manipulation (v6.1)
See merge request espressif/esp-idf!49368
2026-06-10 15:56:59 +05:30
Mahavir Jain
d460486ab4
Merge branch 'fix/ecdsa_ecc_hw_input_validation_v6.1' into 'release/v6.1'
...
Validate ECDSA signature range and harden ECC memory power-down (v6.1)
See merge request espressif/esp-idf!49427
2026-06-10 14:39:49 +05:30
Mahavir Jain
3664bd2d7e
Merge branch 'fix/disable_secure_boot_v2_ecdsa_v6.1' into 'release/v6.1'
...
Fix/disable secure boot v2 ecdsa (v6.1)
See merge request espressif/esp-idf!49469
2026-06-10 14:39:06 +05:30
Jiang Jiang Jian
83abf396e3
Merge branch 'idf/ble_iso_minor_update_v6.1' into 'release/v6.1'
...
feat(ble_iso): Minor update for some ISO internal functions (v6.1)
See merge request espressif/esp-idf!49324
2026-06-10 15:52:25 +08:00
gaoxu
395e5268ff
fix(adc): fix ADC monitor channel 8/9 error
...
(Closes https://github.com/espressif/esp-idf/issues/17768 )
2026-06-10 15:10:14 +08:00
Laukik Hase
ba0f3f9872
fix(esp_tee): Harden the TEE secure services against REE manipulation
...
- `bootloader_flash_execute_command_common`: whitelist the flash command
opcodes the REE actually uses; reject the rest
- `spi_flash_hal_* services`: a forged `host->driver` could hijack TEE
control flow since the HAL dispatches through it, so swap
`host->driver` to a TEE-rodata vtable around each HAL call
- Deny partition table and bootloader writes by default and permit
bootloader writes only when explicitly enabled via
`CONFIG_SPI_FLASH_DANGEROUS_WRITE_ALLOWED` option
- Protect the TEE-assigned interrupt pin configuration against REE
- Validate nested DS context pointers in start/finish_sign and bound
the result copy to the SoC max signature size
- Fix the stack usage in service dispatcher argument parsing
2026-06-10 12:05:47 +05:30
Mahavir Jain
5714492876
Merge branch 'fix/esp_tee_buffer_overflow_v6.1' into 'release/v6.1'
...
fix(esp_tee): fix buffer overflow (v6.1)
See merge request espressif/esp-idf!49302
2026-06-10 10:10:37 +05:30
Mahavir Jain
ab40e38287
Merge branch 'fix/remove_nonexistent_crypto_registers_c61_v6.1' into 'release/v6.1'
...
Remove non-existent crypto registers (ESP32-C61) (v6.1)
See merge request espressif/esp-idf!49449
2026-06-10 10:10:00 +05:30
Jiang Jiang Jian
d42457c36b
Merge branch 'bugfix/ci_avrc_abs_vol_example_v6.1' into 'release/v6.1'
...
fix: Fix the potential stack overflow issue in the Classic Bluetooth example (v6.1)
See merge request espressif/esp-idf!49403
2026-06-10 11:16:48 +08:00
Jiang Jiang Jian
895974c34d
Merge branch 'feat/enable_sb_and_fe_support_for_esp32s31_v6.1' into 'release/v6.1'
...
feat: enable Secure Boot, Flash Encryption and Key Manager support in ESP32S31 (v6.1)
See merge request espressif/esp-idf!49161
2026-06-10 11:13:43 +08:00
Jiang Jiang Jian
e406662397
Merge branch 'fix/ble_funcs_reset_default_enabled_v6.1' into 'release/v6.1'
...
fix(bt): Add default BLE controller funcs reset enable (6.1)
See merge request espressif/esp-idf!49139
2026-06-10 11:13:04 +08:00
Jiang Jiang Jian
13d0e1084c
Merge branch 'fix/optimize_menuconfig_speed_v6.1' into 'release/v6.1'
...
fix: optimize menuconfig speed (v6.1)
See merge request espressif/esp-idf!49097
2026-06-10 11:10:37 +08:00
Jiang Jiang Jian
a5565aba09
Merge branch 'fix/154_txrx_at_time_v6.1' into 'release/v6.1'
...
fix(802.15.4): remove comparison between txrx_at and ramp time (v6.1)
See merge request espressif/esp-idf!49078
2026-06-10 11:10:07 +08:00
Jiang Jiang Jian
53e86f49ee
Merge branch 'feat/add_teardown_for_openthread_case_v6.1' into 'release/v6.1'
...
ci: add tear down for openthread ci case (v6.1)
See merge request espressif/esp-idf!49045
2026-06-10 11:09:38 +08:00
Jiang Jiang Jian
9a4d018e0a
Merge branch 'fix/heap-minimum-free-size_v6.1' into 'release/v6.1'
...
fix(heap): Do not consider newly registered heap in minimum free size calculation (v6.1)
See merge request espressif/esp-idf!49035
2026-06-10 11:08:03 +08:00
Jiang Jiang Jian
adc0dc0303
Merge branch 'fix/vfs_incorect_deprecation_v6.1' into 'release/v6.1'
...
fix(storage/vfs): Mark the correct version of function deprecated (v6.1)
See merge request espressif/esp-idf!49016
2026-06-10 11:07:14 +08:00
Jiang Jiang Jian
af02f23b5c
Merge branch 'ci/update_known_failure_case_filename' into 'release/v6.1'
...
ci: fix known_failure_cases_file_name (v6.1)
See merge request espressif/esp-idf!48883
2026-06-10 11:05:17 +08:00
Aditya Patwardhan
4f2f37ca69
change(secure_boot): mark ECDSA based Secure Boot V2 as insecure on affected SoCs
...
ECDSA based Secure Boot V2 is not functional for certain input vectors on
ESP32-C5/C61/H2/P4 and on the preview targets ESP32-H4/H21. RSA based Secure
Boot V2 is the recommended scheme where the SoC supports it. This issue will be
fixed in a future hardware ECO revision; more details will be shared through the
hardware errata document.
A new hidden Kconfig option SECURE_BOOT_V2_ECDSA_INSECURE marks the affected
mass-production SoCs (ESP32-C5/C61/H2/P4). On these SoCs, when hardware Secure
Boot V2 is enabled, the ECDSA (V2) signing scheme is no longer offered by
default; it must be turned on explicitly via SECURE_BOOT_V2_FORCE_ENABLE_ECDSA
under "Allow potentially insecure options" (CONFIG_SECURE_BOOT_INSECURE). App
signing without hardware Secure Boot is not affected. Note that ESP32-C61 has no
RSA based Secure Boot V2, so it has no Secure Boot scheme enabled by default.
The preview targets ESP32-H4 and ESP32-H21 mark ECDSA Secure Boot V2 as not
supported in their SoC capabilities instead of using the option above. As
ESP32-H4 has no other Secure Boot V2 scheme, Secure Boot is disabled entirely on
it; ESP32-H21 retains RSA based Secure Boot V2.
The security documentation keeps the ECDSA Secure Boot V2 content visible and
adds a warning describing the limitation (including that ECDSA Secure Boot V2 on
ESP32-C61 is not recommended for production). CI apps that exercise ECDSA Secure
Boot V2 on the affected SoCs set CONFIG_SECURE_BOOT_V2_FORCE_ENABLE_ECDSA
accordingly.
2026-06-10 03:10:27 +05:30
harshal.patil
6bdaf2a293
fix(soc): Remove non-existent crypto registers (ESP32-C61)
2026-06-09 18:16:33 +05:30
harshal.patil
7984290258
test(esp_hal_security): warm up ECC const-time loop before measuring
2026-06-09 18:12:05 +05:30
harshal.patil
72ea236270
fix(esp_tee): Reset crypto peripherals before the panic-induced reset
2026-06-09 18:12:05 +05:30
harshal.patil
a15edceb89
fix(esp_rom): Patch ets_ecdsa_verify() to include signature bounds check
2026-06-09 18:12:03 +05:30
Jiang Jiang Jian
167ea95823
Merge branch 'fix/phy_cal_v6.1' into 'release/v6.1'
...
fix(phy): fix wifi tx failed when sta wake from deepsleep v6.1
See merge request espressif/esp-idf!49439
2026-06-09 20:08:42 +08:00
Jiang Jiang Jian
c5c08f3328
Merge branch 'bugfix/issues_from_e22_eco2_testsv6.1' into 'release/v6.1'
...
fix(bt/controller): fixed several BR/EDR controller bugs found by WVT regression tests on ESP32-S31
See merge request espressif/esp-idf!49424
2026-06-09 20:08:34 +08:00
sibeibei
2f0b9ebb82
fix(phy): fix wifi tx failed when sta wake from deepsleep
2026-06-09 19:16:38 +08:00
morris
c66f9a3a8e
Merge branch 'feature/esp32h4_flash_support_v6.1' into 'release/v6.1'
...
feat(spi_flash): Add exclusive support for ESP32H4 (v6.1)
See merge request espressif/esp-idf!49419
2026-06-09 18:19:15 +08:00
harshal.patil
beb13babca
fix(mbedtls): validate ECDSA signature range and harden ECC memory power-down
2026-06-09 14:58:59 +05:30
Jiang Jiang Jian
785ab7a4e6
Merge branch 'fix/esp_idf_lp_uart_wakeup_muti_times_v6.1' into 'release/v6.1'
...
fix(ulp): fix lp uart keep wakeup triggered v6.1
See merge request espressif/esp-idf!49396
2026-06-09 17:22:21 +08:00
Jiang Jiang Jian
9ca5354f50
Merge branch 'bugfix/acl_conn_state_error_v6.1' into 'release/v6.1'
...
fix: Fix missing handling for HCI_ERR_CONNECTION_EXISTS (v6.1)
See merge request espressif/esp-idf!49312
2026-06-09 17:21:32 +08:00
Jin Cheng
b62e578edd
fix(bt/controller): fixed several BR/EDR controller bugs found by WVT regression tests on ESP32-S31
2026-06-09 16:34:36 +08:00
Song Ruo Jing
5934c5b7f1
fix(spi_flash): gpspi flash clock could reach higher frequency
2026-06-09 15:27:41 +08:00
Song Ruo Jing
c9f52c7ca7
feat(spi_flash): Add exclusive support for ESP32H4
...
Add 32bit addr support for esp32s31 as well
2026-06-09 15:27:41 +08:00
morris
519334d640
Merge branch 'feat/restful_server_upgrade_vite_version_v6.1' into 'release/v6.1'
...
feat(http_server/restful_server): Upgraded Vite version (v6.1)
See merge request espressif/esp-idf!49414
2026-06-09 14:19:41 +08:00
Hrushikesh Bhosale
7393255564
feat(http_server/restful_server): Upgraded Vite version
...
- Bumped up the Vite version to 7.3.2
2026-06-09 11:24:14 +05:30
yangfeng
1e7dedcd22
fix: Fix the potential stack overflow issue in the Classic Bluetooth example
2026-06-09 09:40:41 +08:00
hebinglin
5ff1c38cb8
fix(ulp): fix lp uart keep wakeup triggered
2026-06-08 19:29:53 +08:00
morris
0d92878008
Merge branch 'fix/suspend_s31_v6.1' into 'release/v6.1'
...
fix(spi_flash): Fix suspend issue on esp32s31, and add trs timing on other target (backport v6.1)
See merge request espressif/esp-idf!49386
2026-06-08 17:10:38 +08:00
morris
a04ef12b93
Merge branch 'fix/fix_s31_pcnt_test_failure_v6.1' into 'release/v6.1'
...
test(pcnt): fix test failure on s31 after AXI raise to 106M (v6.1)
See merge request espressif/esp-idf!49387
2026-06-08 16:25:34 +08:00
Chen Jichang
c4d31bbfc7
test(pcnt): fix test failure on s31 after AXI raise to 106M
2026-06-08 14:50:27 +08:00
C.S.M
01a9cbe421
fix(spi_flash): Fix suspend issue on esp32s31, and add trs timing on other target
2026-06-08 14:39:47 +08:00
morris
c3640229af
Merge branch 'fix/fix_gdma_crc_stuck_with_large_input_v6.1' into 'release/v6.1'
...
fix(gdma): fix crc stuck with large input (v6.1)
See merge request espressif/esp-idf!49360
2026-06-08 11:32:40 +08:00
Jiang Jiang Jian
be531bbec2
Merge branch 'bugfix/esp_idf_retention_bt_4365_v6.1' into 'release/v6.1'
...
fix(esp_hw_support): fix retention hang when no module in link v6.1
See merge request espressif/esp-idf!49293
2026-06-08 11:09:30 +08:00