Skip to content

Commit bf415f5

Browse files
committed
Merge branch 'bugfix/disable_mbedtls_options_v5.3' into 'release/v5.3'
fix(nimble): Deselect MBEDTLS_ECP_RESTARTABLE when mbedTLS is used (v5.3) See merge request espressif/esp-idf!30618
2 parents 55a8a18 + a61a367 commit bf415f5

File tree

5 files changed

+2
-7
lines changed

5 files changed

+2
-7
lines changed

components/bt/controller/esp32c2/Kconfig.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,6 @@ config BT_LE_CRYPTO_STACK_MBEDTLS
349349
bool "Override TinyCrypt with mbedTLS for crypto computations"
350350
default y
351351
depends on !BT_NIMBLE_ENABLED
352-
select MBEDTLS_ECP_RESTARTABLE
353352
select MBEDTLS_CMAC_C
354353
help
355354
Enable this option to choose mbedTLS instead of TinyCrypt for crypto

components/bt/controller/esp32c5/Kconfig.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,6 @@ config BT_LE_CRYPTO_STACK_MBEDTLS
365365
bool "Override TinyCrypt with mbedTLS for crypto computations"
366366
default y
367367
depends on !BT_NIMBLE_ENABLED
368-
select MBEDTLS_ECP_RESTARTABLE
369368
select MBEDTLS_CMAC_C
370369
help
371370
Enable this option to choose mbedTLS instead of TinyCrypt for crypto

components/bt/controller/esp32c6/Kconfig.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,6 @@ config BT_LE_CRYPTO_STACK_MBEDTLS
365365
bool "Override TinyCrypt with mbedTLS for crypto computations"
366366
default y
367367
depends on !BT_NIMBLE_ENABLED
368-
select MBEDTLS_ECP_RESTARTABLE
369368
select MBEDTLS_CMAC_C
370369
help
371370
Enable this option to choose mbedTLS instead of TinyCrypt for crypto

components/bt/controller/esp32h2/Kconfig.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,6 @@ config BT_LE_CRYPTO_STACK_MBEDTLS
356356
bool "Override TinyCrypt with mbedTLS for crypto computations"
357357
default y
358358
depends on !BT_NIMBLE_ENABLED
359-
select MBEDTLS_ECP_RESTARTABLE
360359
select MBEDTLS_CMAC_C
361360
help
362361
Enable this option to choose mbedTLS instead of TinyCrypt for crypto

components/bt/host/nimble/Kconfig.in

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -498,7 +498,6 @@ config BT_NIMBLE_CRYPTO_STACK_MBEDTLS
498498
bool "Override TinyCrypt with mbedTLS for crypto computations"
499499
default y
500500
depends on BT_NIMBLE_ENABLED
501-
select MBEDTLS_ECP_RESTARTABLE
502501
select MBEDTLS_CMAC_C
503502
help
504503
Enable this option to choose mbedTLS instead of TinyCrypt for crypto
@@ -597,7 +596,7 @@ if BT_NIMBLE_EXT_ADV
597596
Enable this option to start periodic advertisement.
598597

599598
config BT_NIMBLE_PERIODIC_ADV_SYNC_TRANSFER
600-
bool "Enable Transer Sync Events"
599+
bool "Enable Transfer Sync Events"
601600
depends on BT_NIMBLE_ENABLE_PERIODIC_ADV
602601
default y
603602
help
@@ -666,7 +665,7 @@ config BT_NIMBLE_GATT_CACHING_MAX_DSCS
666665
depends on BT_NIMBLE_GATT_CACHING
667666
default 64
668667
help
669-
Set this option to set the upper limit on number of discriptors per connection to be cached.
668+
Set this option to set the upper limit on number of descriptors per connection to be cached.
670669

671670
config BT_NIMBLE_WHITELIST_SIZE
672671
int "BLE white list size"

0 commit comments

Comments
 (0)