Skip to content

Commit 3a30ec1

Browse files
maciejbaczmanskimaciejbaczmanski
committed
cmake: openthread: fix required crypto configuration
Add possibility to ignore some crypto configs while creating Crypto requirements for OT libs. Some configurations should not be required and checked when building from libs. Signed-off-by: Maciej Baczmanski <[email protected]>
1 parent c471e4e commit 3a30ec1

File tree

51 files changed

+10
-206
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+10
-206
lines changed

‎openthread/cmake/crypto_config_ignore.txt‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
CONFIG_MBEDTLS_HEAP_SIZE
2+
CONFIG_MBEDTLS_PSA_CRYPTO_BUILTIN_KEYS
3+
CONFIG_MBEDTLS_PSA_KEY_SLOT_COUNT
4+
CONFIG_MBEDTLS_SSL_CIPHERSUITES
5+
CONFIG_MBEDTLS_THREADING_ALT
6+
CONFIG_MBEDTLS_THREADING_C
7+
CONFIG_PSA_WANT_ALG_SHA_512

‎openthread/cmake/crypto_config_tfm_whitelist.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
CONFIG_MBEDTLS_THREADING_ALT
21
CONFIG_MBEDTLS_ENTROPY_POLL

‎openthread/cmake/extensions.cmake‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,11 @@ function(openthread_libs_configuration_write CONFIG_FILE NRFXLIB_RELEASE_TAG)
9393
list(APPEND LIB_CONFIGURATION ${OPENTHREAD_SETTINGS})
9494

9595
# Store Crypto configuration
96+
file(READ "cmake/crypto_config_ignore.txt" CRYPTO_IGNORE)
97+
string(REPLACE "\n" ";" CRYPTO_IGNORE ${CRYPTO_IGNORE})
9698
list(APPEND LIB_CONFIGURATION "\n###################### Crypto configuration ##################\n\n")
9799
foreach (_variableName ${_variableNames})
98-
if("${_variableName}" MATCHES "^CONFIG_MBEDTLS_.*|^CONFIG_PSA_WANT_.*")
100+
if("${_variableName}" MATCHES "^CONFIG_MBEDTLS_.*|^CONFIG_PSA_WANT_.*" AND NOT "${_variableName}" IN_LIST CRYPTO_IGNORE)
99101
list(APPEND CRYPTO_SETTINGS "${_variableName}=${${_variableName}}\n")
100102
endif()
101103
endforeach()

‎openthread/lib/nrf52840/hard-float/v1.3/ftd/openthread_lib_configuration.txt‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,6 @@ CONFIG_MBEDTLS_ENTROPY_C=y
242242
CONFIG_MBEDTLS_ENTROPY_FORCE_SHA256=y
243243
CONFIG_MBEDTLS_ENTROPY_HARDWARE_ALT=y
244244
CONFIG_MBEDTLS_ENTROPY_MAX_SOURCES=1
245-
CONFIG_MBEDTLS_HEAP_SIZE=15360
246245
CONFIG_MBEDTLS_MEMORY_BUFFER_ALLOC_C=y
247246
CONFIG_MBEDTLS_MEMORY_C=y
248247
CONFIG_MBEDTLS_MPI_MAX_SIZE=256
@@ -259,12 +258,9 @@ CONFIG_MBEDTLS_PSA_CRYPTO_CONFIG_FILE=nrf-psa-crypto-config.h
259258
CONFIG_MBEDTLS_PSA_CRYPTO_DRIVERS=y
260259
CONFIG_MBEDTLS_PSA_CRYPTO_STORAGE_C=y
261260
CONFIG_MBEDTLS_PSA_CRYPTO_USER_CONFIG_FILE=nrf-psa-crypto-user-config.h
262-
CONFIG_MBEDTLS_PSA_KEY_SLOT_COUNT=32
263261
CONFIG_MBEDTLS_SHA1_ALT=y
264262
CONFIG_MBEDTLS_SHA224_ALT=y
265263
CONFIG_MBEDTLS_SHA256_ALT=y
266-
CONFIG_MBEDTLS_THREADING_ALT=y
267-
CONFIG_MBEDTLS_THREADING_C=y
268264
CONFIG_MBEDTLS_USE_PSA_CRYPTO=y
269265
CONFIG_PSA_WANT_AES_KEY_SIZE_128=y
270266
CONFIG_PSA_WANT_AES_KEY_SIZE_192=y

‎openthread/lib/nrf52840/hard-float/v1.3/master/openthread_lib_configuration.txt‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,6 @@ CONFIG_MBEDTLS_HAS_CIPHER_MODE_CIPHERSUITE_REQUIREMENTS=y
263263
CONFIG_MBEDTLS_HAS_ECDH_CIPHERSUITE_REQUIREMENTS=y
264264
CONFIG_MBEDTLS_HAS_ECDSA_CIPHERSUITE_REQUIREMENTS=y
265265
CONFIG_MBEDTLS_HAS_ECJPAKE_CIPHERSUITE_REQUIREMENTS=y
266-
CONFIG_MBEDTLS_HEAP_SIZE=15360
267266
CONFIG_MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED=y
268267
CONFIG_MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED=y
269268
CONFIG_MBEDTLS_KEY_EXCHANGE_PSK_ENABLED=y
@@ -288,12 +287,10 @@ CONFIG_MBEDTLS_PSA_CRYPTO_CONFIG_FILE=nrf-psa-crypto-config.h
288287
CONFIG_MBEDTLS_PSA_CRYPTO_DRIVERS=y
289288
CONFIG_MBEDTLS_PSA_CRYPTO_STORAGE_C=y
290289
CONFIG_MBEDTLS_PSA_CRYPTO_USER_CONFIG_FILE=nrf-psa-crypto-user-config.h
291-
CONFIG_MBEDTLS_PSA_KEY_SLOT_COUNT=32
292290
CONFIG_MBEDTLS_SHA1_ALT=y
293291
CONFIG_MBEDTLS_SHA224_ALT=y
294292
CONFIG_MBEDTLS_SHA256_ALT=y
295293
CONFIG_MBEDTLS_SSL_ALL_ALERT_MESSAGES=y
296-
CONFIG_MBEDTLS_SSL_CIPHERSUITES=
297294
CONFIG_MBEDTLS_SSL_CLI_C=y
298295
CONFIG_MBEDTLS_SSL_CONTEXT_SERIALIZATION=y
299296
CONFIG_MBEDTLS_SSL_COOKIE_C=y
@@ -310,8 +307,6 @@ CONFIG_MBEDTLS_SSL_PROTO_DTLS=y
310307
CONFIG_MBEDTLS_SSL_PROTO_TLS1_2=y
311308
CONFIG_MBEDTLS_SSL_SRV_C=y
312309
CONFIG_MBEDTLS_SSL_TLS_C=y
313-
CONFIG_MBEDTLS_THREADING_ALT=y
314-
CONFIG_MBEDTLS_THREADING_C=y
315310
CONFIG_MBEDTLS_TLS_LIBRARY=y
316311
CONFIG_MBEDTLS_USE_PSA_CRYPTO=y
317312
CONFIG_MBEDTLS_X509_CHECK_EXTENDED_KEY_USAGE=y

‎openthread/lib/nrf52840/hard-float/v1.3/mtd/openthread_lib_configuration.txt‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,6 @@ CONFIG_MBEDTLS_ENTROPY_C=y
242242
CONFIG_MBEDTLS_ENTROPY_FORCE_SHA256=y
243243
CONFIG_MBEDTLS_ENTROPY_HARDWARE_ALT=y
244244
CONFIG_MBEDTLS_ENTROPY_MAX_SOURCES=1
245-
CONFIG_MBEDTLS_HEAP_SIZE=15360
246245
CONFIG_MBEDTLS_MEMORY_BUFFER_ALLOC_C=y
247246
CONFIG_MBEDTLS_MEMORY_C=y
248247
CONFIG_MBEDTLS_MPI_MAX_SIZE=256
@@ -259,12 +258,9 @@ CONFIG_MBEDTLS_PSA_CRYPTO_CONFIG_FILE=nrf-psa-crypto-config.h
259258
CONFIG_MBEDTLS_PSA_CRYPTO_DRIVERS=y
260259
CONFIG_MBEDTLS_PSA_CRYPTO_STORAGE_C=y
261260
CONFIG_MBEDTLS_PSA_CRYPTO_USER_CONFIG_FILE=nrf-psa-crypto-user-config.h
262-
CONFIG_MBEDTLS_PSA_KEY_SLOT_COUNT=32
263261
CONFIG_MBEDTLS_SHA1_ALT=y
264262
CONFIG_MBEDTLS_SHA224_ALT=y
265263
CONFIG_MBEDTLS_SHA256_ALT=y
266-
CONFIG_MBEDTLS_THREADING_ALT=y
267-
CONFIG_MBEDTLS_THREADING_C=y
268264
CONFIG_MBEDTLS_USE_PSA_CRYPTO=y
269265
CONFIG_PSA_WANT_AES_KEY_SIZE_128=y
270266
CONFIG_PSA_WANT_AES_KEY_SIZE_192=y

‎openthread/lib/nrf52840/hard-float/v1.4/ftd/openthread_lib_configuration.txt‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,6 @@ CONFIG_MBEDTLS_ENTROPY_C=y
244244
CONFIG_MBEDTLS_ENTROPY_FORCE_SHA256=y
245245
CONFIG_MBEDTLS_ENTROPY_HARDWARE_ALT=y
246246
CONFIG_MBEDTLS_ENTROPY_MAX_SOURCES=1
247-
CONFIG_MBEDTLS_HEAP_SIZE=15360
248247
CONFIG_MBEDTLS_MEMORY_BUFFER_ALLOC_C=y
249248
CONFIG_MBEDTLS_MEMORY_C=y
250249
CONFIG_MBEDTLS_MPI_MAX_SIZE=256
@@ -261,12 +260,9 @@ CONFIG_MBEDTLS_PSA_CRYPTO_CONFIG_FILE=nrf-psa-crypto-config.h
261260
CONFIG_MBEDTLS_PSA_CRYPTO_DRIVERS=y
262261
CONFIG_MBEDTLS_PSA_CRYPTO_STORAGE_C=y
263262
CONFIG_MBEDTLS_PSA_CRYPTO_USER_CONFIG_FILE=nrf-psa-crypto-user-config.h
264-
CONFIG_MBEDTLS_PSA_KEY_SLOT_COUNT=32
265263
CONFIG_MBEDTLS_SHA1_ALT=y
266264
CONFIG_MBEDTLS_SHA224_ALT=y
267265
CONFIG_MBEDTLS_SHA256_ALT=y
268-
CONFIG_MBEDTLS_THREADING_ALT=y
269-
CONFIG_MBEDTLS_THREADING_C=y
270266
CONFIG_MBEDTLS_USE_PSA_CRYPTO=y
271267
CONFIG_PSA_WANT_AES_KEY_SIZE_128=y
272268
CONFIG_PSA_WANT_AES_KEY_SIZE_192=y

‎openthread/lib/nrf52840/hard-float/v1.4/master/openthread_lib_configuration.txt‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,6 @@ CONFIG_MBEDTLS_HAS_CIPHER_MODE_CIPHERSUITE_REQUIREMENTS=y
267267
CONFIG_MBEDTLS_HAS_ECDH_CIPHERSUITE_REQUIREMENTS=y
268268
CONFIG_MBEDTLS_HAS_ECDSA_CIPHERSUITE_REQUIREMENTS=y
269269
CONFIG_MBEDTLS_HAS_ECJPAKE_CIPHERSUITE_REQUIREMENTS=y
270-
CONFIG_MBEDTLS_HEAP_SIZE=15360
271270
CONFIG_MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED=y
272271
CONFIG_MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED=y
273272
CONFIG_MBEDTLS_KEY_EXCHANGE_PSK_ENABLED=y
@@ -292,12 +291,10 @@ CONFIG_MBEDTLS_PSA_CRYPTO_CONFIG_FILE=nrf-psa-crypto-config.h
292291
CONFIG_MBEDTLS_PSA_CRYPTO_DRIVERS=y
293292
CONFIG_MBEDTLS_PSA_CRYPTO_STORAGE_C=y
294293
CONFIG_MBEDTLS_PSA_CRYPTO_USER_CONFIG_FILE=nrf-psa-crypto-user-config.h
295-
CONFIG_MBEDTLS_PSA_KEY_SLOT_COUNT=32
296294
CONFIG_MBEDTLS_SHA1_ALT=y
297295
CONFIG_MBEDTLS_SHA224_ALT=y
298296
CONFIG_MBEDTLS_SHA256_ALT=y
299297
CONFIG_MBEDTLS_SSL_ALL_ALERT_MESSAGES=y
300-
CONFIG_MBEDTLS_SSL_CIPHERSUITES=
301298
CONFIG_MBEDTLS_SSL_CLI_C=y
302299
CONFIG_MBEDTLS_SSL_CONTEXT_SERIALIZATION=y
303300
CONFIG_MBEDTLS_SSL_COOKIE_C=y
@@ -314,8 +311,6 @@ CONFIG_MBEDTLS_SSL_PROTO_DTLS=y
314311
CONFIG_MBEDTLS_SSL_PROTO_TLS1_2=y
315312
CONFIG_MBEDTLS_SSL_SRV_C=y
316313
CONFIG_MBEDTLS_SSL_TLS_C=y
317-
CONFIG_MBEDTLS_THREADING_ALT=y
318-
CONFIG_MBEDTLS_THREADING_C=y
319314
CONFIG_MBEDTLS_TLS_LIBRARY=y
320315
CONFIG_MBEDTLS_USE_PSA_CRYPTO=y
321316
CONFIG_MBEDTLS_X509_CHECK_EXTENDED_KEY_USAGE=y

‎openthread/lib/nrf52840/hard-float/v1.4/mtd/openthread_lib_configuration.txt‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,6 @@ CONFIG_MBEDTLS_ENTROPY_C=y
244244
CONFIG_MBEDTLS_ENTROPY_FORCE_SHA256=y
245245
CONFIG_MBEDTLS_ENTROPY_HARDWARE_ALT=y
246246
CONFIG_MBEDTLS_ENTROPY_MAX_SOURCES=1
247-
CONFIG_MBEDTLS_HEAP_SIZE=15360
248247
CONFIG_MBEDTLS_MEMORY_BUFFER_ALLOC_C=y
249248
CONFIG_MBEDTLS_MEMORY_C=y
250249
CONFIG_MBEDTLS_MPI_MAX_SIZE=256
@@ -261,12 +260,9 @@ CONFIG_MBEDTLS_PSA_CRYPTO_CONFIG_FILE=nrf-psa-crypto-config.h
261260
CONFIG_MBEDTLS_PSA_CRYPTO_DRIVERS=y
262261
CONFIG_MBEDTLS_PSA_CRYPTO_STORAGE_C=y
263262
CONFIG_MBEDTLS_PSA_CRYPTO_USER_CONFIG_FILE=nrf-psa-crypto-user-config.h
264-
CONFIG_MBEDTLS_PSA_KEY_SLOT_COUNT=32
265263
CONFIG_MBEDTLS_SHA1_ALT=y
266264
CONFIG_MBEDTLS_SHA224_ALT=y
267265
CONFIG_MBEDTLS_SHA256_ALT=y
268-
CONFIG_MBEDTLS_THREADING_ALT=y
269-
CONFIG_MBEDTLS_THREADING_C=y
270266
CONFIG_MBEDTLS_USE_PSA_CRYPTO=y
271267
CONFIG_PSA_WANT_AES_KEY_SIZE_128=y
272268
CONFIG_PSA_WANT_AES_KEY_SIZE_192=y

‎openthread/lib/nrf52840/soft-float/v1.3/ftd/openthread_lib_configuration.txt‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,6 @@ CONFIG_MBEDTLS_ENTROPY_C=y
242242
CONFIG_MBEDTLS_ENTROPY_FORCE_SHA256=y
243243
CONFIG_MBEDTLS_ENTROPY_HARDWARE_ALT=y
244244
CONFIG_MBEDTLS_ENTROPY_MAX_SOURCES=1
245-
CONFIG_MBEDTLS_HEAP_SIZE=15360
246245
CONFIG_MBEDTLS_MEMORY_BUFFER_ALLOC_C=y
247246
CONFIG_MBEDTLS_MEMORY_C=y
248247
CONFIG_MBEDTLS_MPI_MAX_SIZE=256
@@ -259,12 +258,9 @@ CONFIG_MBEDTLS_PSA_CRYPTO_CONFIG_FILE=nrf-psa-crypto-config.h
259258
CONFIG_MBEDTLS_PSA_CRYPTO_DRIVERS=y
260259
CONFIG_MBEDTLS_PSA_CRYPTO_STORAGE_C=y
261260
CONFIG_MBEDTLS_PSA_CRYPTO_USER_CONFIG_FILE=nrf-psa-crypto-user-config.h
262-
CONFIG_MBEDTLS_PSA_KEY_SLOT_COUNT=32
263261
CONFIG_MBEDTLS_SHA1_ALT=y
264262
CONFIG_MBEDTLS_SHA224_ALT=y
265263
CONFIG_MBEDTLS_SHA256_ALT=y
266-
CONFIG_MBEDTLS_THREADING_ALT=y
267-
CONFIG_MBEDTLS_THREADING_C=y
268264
CONFIG_MBEDTLS_USE_PSA_CRYPTO=y
269265
CONFIG_PSA_WANT_AES_KEY_SIZE_128=y
270266
CONFIG_PSA_WANT_AES_KEY_SIZE_192=y

0 commit comments

Comments
 (0)