Island
11f9081a0e
Merge branch 'backport/fix_ble_prepare_write_v4.4' into 'release/v4.4'
...
Backport/fix ble prepare write v4.4
See merge request espressif/esp-idf!27907
2023-12-20 21:46:07 +08:00
Roland Dobai
cdc3baac87
Merge branch 'fix/sbom_validation_post_commit_v4.4' into 'release/v4.4'
...
fix: do sbom manifest validation in post-commit (v4.4)
See merge request espressif/esp-idf!28013
2023-12-20 00:11:30 +08:00
Frantisek Hrbata
1ba5757fed
fix: do sbom manifest validation in post-commit
...
Following commit c3afbebf2316 ("fix: bump esp-idf-sbom to v0.13.0 in pre-commit"),
the validation of submodule hash now relies solely on the information recorded
in the git-tree. Previously, the hash verification used submodule's
working tree hash if available. Since the new submodule hash is recorded
in git-tree only after the commit is created, we need to move the check
into post-commit, otherwise the hash validation checks the old value.
For example:
1. in .gitmodules
[submodule "components/json/cJSON"]
sbom-hash = cb8693b058ba302f4829ec6d03f609ac6f848546
2. update the cJSON
$ git -C components/json/cJSON checkout b45f48e600671feade0b6bd65d1c69de7899f2be
3. update cJSON hash in .gitmodules
[submodule "components/json/cJSON"]
sbom-hash = b45f48e600671feade0b6bd65d1c69de7899f2be
4. commit the changes
$ git commit -a -s
Step 4. will fail, because the validation is currently started in pre-commit stage,
where the hash for cJSON recorded in git-tree is still
cb8693b058ba302f4829ec6d03f609ac6f848546. The new hash b45f48e600671feade0b6bd65d1c69de7899f2be
will be stored in git-tree after the new commit is created.
Note that this means we cannot prevent the commit creation, but only
notify user about the hash inconsistency. If he/she still decides to
push it, it will fail in pre-commit checks in CI.
Signed-off-by: Frantisek Hrbata <frantisek.hrbata@espressif.com>
2023-12-19 12:34:36 +01:00
zhanghaipeng
36169e6beb
fix(bt/bluedroid): Fix prepare write for BLE example
2023-12-19 17:00:37 +08:00
Island
ad44330e8e
Merge branch 'bugfix/ble_stack_disable_v4.4' into 'release/v4.4'
...
Bugfix/ble stack disable v4.4(backport v4.4)
See merge request espressif/esp-idf!27648
2023-12-19 12:02:50 +08:00
zhanghaipeng
3263b4e75f
fix(bt/bluedroid): Fix ble adv and scan status when deinit bluedroid
2023-12-18 18:55:26 +08:00
zhanghaipeng
7364d276f7
fix(bt/bluedroid): Fix ble gattc deregister
2023-12-18 18:55:26 +08:00
Jiang Jiang Jian
979a56386d
Merge branch 'optimize/When_psram_is_enable_the_number_of_ooseq_is_not_limited_4.4' into 'release/v4.4'
...
optimize(lwip):when psram is enable the number of ooseq is not limited 4.4
See merge request espressif/esp-idf!27946
2023-12-18 13:46:12 +08:00
zhanghaipeng
4c4e95cae9
fix(bt/bluedroid): Fix BLE prepare write
2023-12-18 11:29:35 +08:00
Jiang Jiang Jian
ef543e8e56
Merge branch 'bugfix/miss_rm_s3_ld_v4.4' into 'release/v4.4'
...
fix(WiFi): update esp32s3 rom ld(v4.4)
See merge request espressif/esp-idf!27958
2023-12-18 11:15:42 +08:00
morris
a362b87809
Merge branch 'fix/spi_lcd_example_fix_border_pixel_display_v4.4' into 'release/v4.4'
...
fix(spi_master): fixed lcd example block border pixel issue (v4.4)
See merge request espressif/esp-idf!27922
2023-12-18 11:10:47 +08:00
Mahavir Jain
f19f6e0561
Merge branch 'feature/update_nghttp2_lib_v4.4' into 'release/v4.4'
...
feat(nghttp2): Update nghttp2 lib to v1.58.0
See merge request espressif/esp-idf!27707
2023-12-17 16:39:02 +08:00
alanmaxwell
6007eb82fa
fix(WiFi): update esp32s3 rom ld
2023-12-16 13:33:26 +08:00
Aditya Patwardhan
b92c24a9ba
Merge branch 'fix/aes_mpi_interrupt_allocation_workflow_v4.4' into 'release/v4.4'
...
fix(mbedtls): move interrupt allocation during initialization phase (v4.4)
See merge request espressif/esp-idf!27443
2023-12-15 17:12:42 +08:00
Xue yun fei
c392dad1dc
optimize(lwip):when psram is enable the number of ooseq is not limited
2023-12-15 15:54:31 +08:00
Jiang Jiang Jian
3192aca478
Merge branch 'bugfix/mem_leak_fastpbkdf2_test' into 'release/v4.4'
...
fix(wpa_supplicant): Resolve memory leak for test case of fast pbkdf2
See merge request espressif/esp-idf!27889
2023-12-15 11:18:29 +08:00
Jiang Jiang Jian
0bb983f9d5
Merge branch 'bugfix/fix_issuse_in_scan_and_mesh_v4.4' into 'release/v4.4'
...
fix(wifi): fix issues in scan and wifi mesh (v4.4)
See merge request espressif/esp-idf!27861
2023-12-15 10:38:46 +08:00
Roland Dobai
dbb71c010f
Merge branch 'fix/py12_req' into 'release/v4.4'
...
Fix(tools): Use a construct dependency compatible with Python 3.12
See merge request espressif/esp-idf!27925
2023-12-14 22:05:04 +08:00
Roland Dobai
91ca4a74aa
Fix(tools): Use a construct dependency compatible with Python 3.12
2023-12-14 12:25:54 +01:00
wanlei
aa264cab8f
fix(spi_master): fixed lcd example block border pixel issue
2023-12-14 17:18:10 +08:00
Rahul Tank
3f117c79d9
Merge branch 'bugfix/authcomplete_failure_v4.4' into 'release/v4.4'
...
fix(nimble): Fixed authcomplete failure caused by a mismatch in the c1 value (v4.4)
See merge request espressif/esp-idf!27637
2023-12-14 13:15:17 +08:00
Shreyas Sheth
aa8822bbf1
fix(wpa_supplicant): Resolve memory leak for unit test of fast pbkdf2
2023-12-13 16:12:00 +05:30
Roland Dobai
95873f4c33
Merge branch 'fix/bump_precommit_esp_idf_sbom_v4.4' into 'release/v4.4'
...
fix: bump esp-idf-sbom to v0.13.0 in pre-commit (v4.4)
See merge request espressif/esp-idf!27880
2023-12-13 17:03:24 +08:00
Jiang Jiang Jian
e47fe5df8e
Merge branch 'fix/build_error_in_compiler_performance_mode_v4.4' into 'release/v4.4'
...
fix(bt/bluedroid): fixed build error when compiler in performace mode (backport v4.4)
See merge request espressif/esp-idf!27866
2023-12-13 15:01:46 +08:00
Frantisek Hrbata
ab3ed9ee44
fix: bump esp-idf-sbom to v0.13.0 in pre-commit
...
v0.13.0 contains fix for the submodule hash validation. Let's
bump its version in pre-commit, so the fix is used.
Signed-off-by: Frantisek Hrbata <frantisek.hrbata@espressif.com>
2023-12-13 07:31:37 +01:00
gongyantao
ba81334bf5
fix(bt/bluedroid): fixed build error when compiler in performace mode
...
Closes https://github.com/espressif/esp-idf/issues/12751
2023-12-12 19:04:49 +08:00
zhangyanjiao
1a0f4524da
fix(wifi): fix issues in scan and wifi mesh
...
1. fix(wifi): fix the crash issue when clear scan ap list
3. fix wifi mode error when mesh start after station has connected to router
2023-12-12 17:21:04 +08:00
Ivan Grokhotkov
a2b4ddc113
Merge branch 'revert-3f015297' into 'release/v4.4'
...
Revert "Merge branch 'bugfix/nvs_read_out_of_bounds' into 'release/v4.4'"
See merge request espressif/esp-idf!27856
2023-12-12 15:26:25 +08:00
Jiang Jiang Jian
c452233a6e
Merge branch 'fix/lwip_dns_fallback_ipv4only' into 'release/v4.4'
...
lwip: Fix DNS int with FALLBACK_DNS() in IPv4 only (v4.4)
See merge request espressif/esp-idf!27544
2023-12-12 14:38:48 +08:00
Martin Vychodil
0ae5b6c0b2
Revert "Merge branch 'bugfix/nvs_read_out_of_bounds' into 'release/v4.4'"
...
This reverts merge request !27852
2023-12-12 13:30:50 +08:00
Martin Vychodil
3f0152978d
Merge branch 'bugfix/nvs_read_out_of_bounds' into 'release/v4.4'
...
fix(nvs): prevent out-of-bounds write on inconsistent blob length
See merge request espressif/esp-idf!27852
2023-12-12 12:56:30 +08:00
Jiang Jiang Jian
7a0a868603
Merge branch 'contrib/github_pr_12460_v4.4' into 'release/v4.4'
...
fixing OTA write up to SPI_FLASH_SEC_SIZE margins (GitHub PR) (v4.4)
See merge request espressif/esp-idf!27646
2023-12-12 10:05:22 +08:00
Jiang Jiang Jian
8812baf39f
Merge branch 'fix/esp32s3_soc_drom_high_addr_v4.4' into 'release/v4.4'
...
fix(soc): esp32s3/Fix the DROM_HIGH_ADDR (v4.4)
See merge request espressif/esp-idf!27824
2023-12-12 10:04:57 +08:00
Ivan Grokhotkov
a24f51431d
fix(nvs): prevent out of bounds write if blob data is inconsistent
2023-12-11 23:04:35 +08:00
Ivan Grokhotkov
e6db7ddf2a
Merge branch 'feature/add_fatfs_sbom_v4.4' into 'release/v4.4'
...
feat(storage/fatfs): add sbom file manifest for FatFs (v4.4)
See merge request espressif/esp-idf!27482
2023-12-11 18:14:25 +08:00
Tomas Rohlinek
cff118820f
feat(storage/fatfs): add sbom file manifest for FatFs (v4.4)
2023-12-11 18:14:25 +08:00
Mahavir Jain
09089c3fdf
Merge branch 'fix/esp_ptr_check_sign_compare_v4.4' into 'release/v4.4'
...
fix(esp_hw_support): Fix different signed comparison in `esp_ptr_in_drom`
See merge request espressif/esp-idf!27817
2023-12-11 16:07:46 +08:00
Aditya Patwardhan
2e973e28dc
fix(soc): esp32s3/Fix the DROM_DROM_HIGH limit
...
Previously the DROM_HIGH_ADDR for esp32s3 was 0x3D000000, which
convers only 16 MB of address range. But esp32s3 supports 32 MB
external memory. So this address should be 0x3E000000
2023-12-11 13:22:55 +05:30
Jiang Jiang Jian
69f63b2a16
Merge branch 'bugfix/install_key_issue_v4.4' into 'release/v4.4'
...
fix(wifi): Fix key install issue in PTK renew(v4.4)
See merge request espressif/esp-idf!27318
2023-12-11 15:24:41 +08:00
Jiang Jiang Jian
597a4d4926
Merge branch 'bugfix/fix_some_ble_bugs_v4.4' into 'release/v4.4'
...
Fixed some BLE bugs (backport v4.4)
See merge request espressif/esp-idf!27698
2023-12-11 15:07:54 +08:00
Laukik Hase
77a7eb217a
fix(esp_hw_support): Fix different signed comparison in esp_ptr_in_drom
...
- Closes https://github.com/espressif/esp-idf/pull/12720
2023-12-11 10:21:27 +05:30
xueyunfei
083eb06028
Fix(lwip):bugfix for add config for tcp ooseq bufs
2023-12-08 19:13:11 +01:00
Jiang Jiang Jian
2026c783ed
Merge branch 'feat/max_ver_c3_199_v4.4' into 'release/v4.4'
...
feat(soc): Increase max supported version of C3 to 1.99 (v4.4)
See merge request espressif/esp-idf!26825
2023-12-08 20:56:05 +08:00
chenjianhua
2f850519ef
fix(bt): Update bt lib for ESP32-C3 and ESP32-S3(65db61f)
...
- Fixed remove and clear white list
2023-12-08 19:42:16 +08:00
chenjianhua
4e518185c5
fix(bt): Update bt lib for ESP32(fa43201)
...
- Fixed assert for instant passed workaround
- Fixed scan evt timeout
- Fixed random address setting when scanning
2023-12-08 19:41:15 +08:00
shangke
8eec988290
fix(bt/controller): Fixed some HCI commands parameter
2023-12-08 19:41:15 +08:00
chenjianhua
72315ed011
fix(bt): Update bt lib for ESP32-C3 and ESP32-S3(b8f0db9)
...
- Fixed assert when llcp instant passed
2023-12-08 19:41:15 +08:00
chenjianhua
c908325d3d
fix(bt): Update bt lib for ESP32-C3 and ESP32-S3(70ab55f)
...
- Fixed assert for instant passed workaround
- Fixed add RPA to white list
- Fixed AES encryption for RPA resolution
2023-12-08 19:41:15 +08:00
chenjianhua
148ee05b87
fix(bt/bluedroid): Fixed add RPA to white list
2023-12-08 19:41:15 +08:00
Kapil Gupta
ad3891b94b
fix(wifi): Fix key install issue in PTK renew
2023-12-08 15:23:36 +05:30