mirror of
https://github.com/espressif/esp-idf.git
synced 2024-10-05 20:47:46 -04:00
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
This commit is contained in:
commit
bf415f580f
@ -349,7 +349,6 @@ config BT_LE_CRYPTO_STACK_MBEDTLS
|
|||||||
bool "Override TinyCrypt with mbedTLS for crypto computations"
|
bool "Override TinyCrypt with mbedTLS for crypto computations"
|
||||||
default y
|
default y
|
||||||
depends on !BT_NIMBLE_ENABLED
|
depends on !BT_NIMBLE_ENABLED
|
||||||
select MBEDTLS_ECP_RESTARTABLE
|
|
||||||
select MBEDTLS_CMAC_C
|
select MBEDTLS_CMAC_C
|
||||||
help
|
help
|
||||||
Enable this option to choose mbedTLS instead of TinyCrypt for crypto
|
Enable this option to choose mbedTLS instead of TinyCrypt for crypto
|
||||||
|
@ -365,7 +365,6 @@ config BT_LE_CRYPTO_STACK_MBEDTLS
|
|||||||
bool "Override TinyCrypt with mbedTLS for crypto computations"
|
bool "Override TinyCrypt with mbedTLS for crypto computations"
|
||||||
default y
|
default y
|
||||||
depends on !BT_NIMBLE_ENABLED
|
depends on !BT_NIMBLE_ENABLED
|
||||||
select MBEDTLS_ECP_RESTARTABLE
|
|
||||||
select MBEDTLS_CMAC_C
|
select MBEDTLS_CMAC_C
|
||||||
help
|
help
|
||||||
Enable this option to choose mbedTLS instead of TinyCrypt for crypto
|
Enable this option to choose mbedTLS instead of TinyCrypt for crypto
|
||||||
|
@ -365,7 +365,6 @@ config BT_LE_CRYPTO_STACK_MBEDTLS
|
|||||||
bool "Override TinyCrypt with mbedTLS for crypto computations"
|
bool "Override TinyCrypt with mbedTLS for crypto computations"
|
||||||
default y
|
default y
|
||||||
depends on !BT_NIMBLE_ENABLED
|
depends on !BT_NIMBLE_ENABLED
|
||||||
select MBEDTLS_ECP_RESTARTABLE
|
|
||||||
select MBEDTLS_CMAC_C
|
select MBEDTLS_CMAC_C
|
||||||
help
|
help
|
||||||
Enable this option to choose mbedTLS instead of TinyCrypt for crypto
|
Enable this option to choose mbedTLS instead of TinyCrypt for crypto
|
||||||
|
@ -356,7 +356,6 @@ config BT_LE_CRYPTO_STACK_MBEDTLS
|
|||||||
bool "Override TinyCrypt with mbedTLS for crypto computations"
|
bool "Override TinyCrypt with mbedTLS for crypto computations"
|
||||||
default y
|
default y
|
||||||
depends on !BT_NIMBLE_ENABLED
|
depends on !BT_NIMBLE_ENABLED
|
||||||
select MBEDTLS_ECP_RESTARTABLE
|
|
||||||
select MBEDTLS_CMAC_C
|
select MBEDTLS_CMAC_C
|
||||||
help
|
help
|
||||||
Enable this option to choose mbedTLS instead of TinyCrypt for crypto
|
Enable this option to choose mbedTLS instead of TinyCrypt for crypto
|
||||||
|
@ -498,7 +498,6 @@ config BT_NIMBLE_CRYPTO_STACK_MBEDTLS
|
|||||||
bool "Override TinyCrypt with mbedTLS for crypto computations"
|
bool "Override TinyCrypt with mbedTLS for crypto computations"
|
||||||
default y
|
default y
|
||||||
depends on BT_NIMBLE_ENABLED
|
depends on BT_NIMBLE_ENABLED
|
||||||
select MBEDTLS_ECP_RESTARTABLE
|
|
||||||
select MBEDTLS_CMAC_C
|
select MBEDTLS_CMAC_C
|
||||||
help
|
help
|
||||||
Enable this option to choose mbedTLS instead of TinyCrypt for crypto
|
Enable this option to choose mbedTLS instead of TinyCrypt for crypto
|
||||||
@ -597,7 +596,7 @@ if BT_NIMBLE_EXT_ADV
|
|||||||
Enable this option to start periodic advertisement.
|
Enable this option to start periodic advertisement.
|
||||||
|
|
||||||
config BT_NIMBLE_PERIODIC_ADV_SYNC_TRANSFER
|
config BT_NIMBLE_PERIODIC_ADV_SYNC_TRANSFER
|
||||||
bool "Enable Transer Sync Events"
|
bool "Enable Transfer Sync Events"
|
||||||
depends on BT_NIMBLE_ENABLE_PERIODIC_ADV
|
depends on BT_NIMBLE_ENABLE_PERIODIC_ADV
|
||||||
default y
|
default y
|
||||||
help
|
help
|
||||||
@ -666,7 +665,7 @@ config BT_NIMBLE_GATT_CACHING_MAX_DSCS
|
|||||||
depends on BT_NIMBLE_GATT_CACHING
|
depends on BT_NIMBLE_GATT_CACHING
|
||||||
default 64
|
default 64
|
||||||
help
|
help
|
||||||
Set this option to set the upper limit on number of discriptors per connection to be cached.
|
Set this option to set the upper limit on number of descriptors per connection to be cached.
|
||||||
|
|
||||||
config BT_NIMBLE_WHITELIST_SIZE
|
config BT_NIMBLE_WHITELIST_SIZE
|
||||||
int "BLE white list size"
|
int "BLE white list size"
|
||||||
|
Loading…
Reference in New Issue
Block a user