Skip to content

Commit f790fb8

Browse files
davidhorstmann-armdavidhorstmann-arm
authored
Merge pull request #10367 from davidhorstmann-arm/configuration-crypto-sh-legacy-ecdsa-deterministic
Remove component uses of `MBEDTLS_ECDSA_DETERMINISTIC`
2 parents d840231 + b907dbc commit f790fb8

File tree

3 files changed

+129
-131
lines changed

3 files changed

+129
-131
lines changed

‎tests/scripts/components-configuration-crypto.sh‎

Lines changed: 78 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -82,27 +82,27 @@ component_test_psa_crypto_without_heap() {
8282
msg "crypto without heap: build libtestdriver1"
8383
# Disable PSA features that cannot be accelerated and whose builtin support
8484
# requires calloc/free.
85-
scripts/config.py -c $CRYPTO_CONFIG_H unset PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_DERIVE
86-
scripts/config.py -c $CRYPTO_CONFIG_H unset-all "^PSA_WANT_ALG_HKDF"
87-
scripts/config.py -c $CRYPTO_CONFIG_H unset-all "^PSA_WANT_ALG_PBKDF2_"
88-
scripts/config.py -c $CRYPTO_CONFIG_H unset-all "^PSA_WANT_ALG_TLS12_"
85+
scripts/config.py unset PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_DERIVE
86+
scripts/config.py unset-all "^PSA_WANT_ALG_HKDF"
87+
scripts/config.py unset-all "^PSA_WANT_ALG_PBKDF2_"
88+
scripts/config.py unset-all "^PSA_WANT_ALG_TLS12_"
8989
# RSA key support requires ASN1 parse/write support for testing, but ASN1
9090
# is disabled below.
91-
scripts/config.py -c $CRYPTO_CONFIG_H unset-all "^PSA_WANT_KEY_TYPE_RSA_"
92-
scripts/config.py -c $CRYPTO_CONFIG_H unset-all "^PSA_WANT_ALG_RSA_"
91+
scripts/config.py unset-all "^PSA_WANT_KEY_TYPE_RSA_"
92+
scripts/config.py unset-all "^PSA_WANT_ALG_RSA_"
9393
# DES requires built-in support for key generation (parity check) so it
9494
# cannot be accelerated
95-
scripts/config.py -c $CRYPTO_CONFIG_H unset PSA_WANT_KEY_TYPE_DES
95+
scripts/config.py unset PSA_WANT_KEY_TYPE_DES
9696
# EC-JPAKE use calloc/free in PSA core
97-
scripts/config.py -c $CRYPTO_CONFIG_H unset PSA_WANT_ALG_JPAKE
97+
scripts/config.py unset PSA_WANT_ALG_JPAKE
9898
# Enable p192[k|r]1 curves which are disabled by default in tf-psa-crypto.
9999
# This is required to get the proper test coverage otherwise there are
100100
# tests in 'test_suite_psa_crypto_op_fail' that would never be executed.
101101
scripts/config.py set PSA_WANT_ECC_SECP_K1_192
102102
scripts/config.py set PSA_WANT_ECC_SECP_R1_192
103103

104104
# Accelerate all PSA features (which are still enabled in CRYPTO_CONFIG_H).
105-
PSA_SYM_LIST=$(./scripts/config.py -c $CRYPTO_CONFIG_H get-all-enabled PSA_WANT)
105+
PSA_SYM_LIST=$(./scripts/config.py get-all-enabled PSA_WANT)
106106
loc_accel_list=$(echo $PSA_SYM_LIST | sed 's/PSA_WANT_//g')
107107

108108
helper_libtestdriver1_adjust_config crypto
@@ -143,7 +143,7 @@ component_test_psa_crypto_without_heap() {
143143

144144
component_test_no_rsa_key_pair_generation () {
145145
msg "build: default config minus PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_GENERATE"
146-
scripts/config.py -c $CRYPTO_CONFIG_H unset PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_GENERATE
146+
scripts/config.py unset PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_GENERATE
147147
make
148148

149149
msg "test: default config minus PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_GENERATE"
@@ -210,7 +210,7 @@ component_test_no_hmac_drbg_use_psa () {
210210
msg "build: Full minus HMAC_DRBG, PSA crypto in TLS"
211211
scripts/config.py full
212212
scripts/config.py unset MBEDTLS_HMAC_DRBG_C
213-
scripts/config.py unset MBEDTLS_ECDSA_DETERMINISTIC # requires HMAC_DRBG
213+
scripts/config.py unset PSA_WANT_ALG_DETERMINISTIC_ECDSA # requires HMAC_DRBG
214214

215215
CC=$ASAN_CC cmake -D CMAKE_BUILD_TYPE:String=Asan .
216216
make
@@ -241,7 +241,7 @@ component_test_psa_external_rng_no_drbg_use_psa () {
241241
scripts/config.py unset MBEDTLS_PLATFORM_NV_SEED_ALT
242242
scripts/config.py unset MBEDTLS_CTR_DRBG_C
243243
scripts/config.py unset MBEDTLS_HMAC_DRBG_C
244-
scripts/config.py unset MBEDTLS_ECDSA_DETERMINISTIC # requires HMAC_DRBG
244+
scripts/config.py unset PSA_WANT_ALG_DETERMINISTIC_ECDSA # Requires HMAC_DRBG
245245
make CC=$ASAN_CC CFLAGS="$ASAN_CFLAGS" LDFLAGS="$ASAN_CFLAGS"
246246

247247
msg "test: PSA_CRYPTO_EXTERNAL_RNG minus *_DRBG, PSA crypto - main suites"
@@ -293,8 +293,7 @@ component_test_crypto_full_md_light_only () {
293293
scripts/config.py unset MBEDTLS_HMAC_DRBG_C
294294
scripts/config.py unset MBEDTLS_PKCS7_C
295295
# Disable indirect dependencies of MD_C
296-
scripts/config.py unset MBEDTLS_ECDSA_DETERMINISTIC # needs HMAC_DRBG
297-
scripts/config.py -c $CRYPTO_CONFIG_H unset PSA_WANT_ALG_DETERMINISTIC_ECDSA
296+
scripts/config.py unset PSA_WANT_ALG_DETERMINISTIC_ECDSA
298297
# Disable things that would auto-enable MD_C
299298
scripts/config.py unset MBEDTLS_PKCS5_C
300299

@@ -319,17 +318,17 @@ component_test_full_no_cipher () {
319318
# on CIPHER_C so we disable them.
320319
# This does not hold for KEY_TYPE_CHACHA20 and ALG_CHACHA20_POLY1305
321320
# so we keep them enabled.
322-
scripts/config.py -c $CRYPTO_CONFIG_H unset PSA_WANT_ALG_CCM_STAR_NO_TAG
323-
scripts/config.py -c $CRYPTO_CONFIG_H unset PSA_WANT_ALG_CMAC
324-
scripts/config.py -c $CRYPTO_CONFIG_H unset PSA_WANT_ALG_CBC_NO_PADDING
325-
scripts/config.py -c $CRYPTO_CONFIG_H unset PSA_WANT_ALG_CBC_PKCS7
326-
scripts/config.py -c $CRYPTO_CONFIG_H unset PSA_WANT_ALG_CFB
327-
scripts/config.py -c $CRYPTO_CONFIG_H unset PSA_WANT_ALG_CTR
328-
scripts/config.py -c $CRYPTO_CONFIG_H unset PSA_WANT_ALG_ECB_NO_PADDING
329-
scripts/config.py -c $CRYPTO_CONFIG_H unset PSA_WANT_ALG_OFB
330-
scripts/config.py -c $CRYPTO_CONFIG_H unset PSA_WANT_ALG_PBKDF2_AES_CMAC_PRF_128
331-
scripts/config.py -c $CRYPTO_CONFIG_H unset PSA_WANT_ALG_STREAM_CIPHER
332-
scripts/config.py -c $CRYPTO_CONFIG_H unset PSA_WANT_KEY_TYPE_DES
321+
scripts/config.py unset PSA_WANT_ALG_CCM_STAR_NO_TAG
322+
scripts/config.py unset PSA_WANT_ALG_CMAC
323+
scripts/config.py unset PSA_WANT_ALG_CBC_NO_PADDING
324+
scripts/config.py unset PSA_WANT_ALG_CBC_PKCS7
325+
scripts/config.py unset PSA_WANT_ALG_CFB
326+
scripts/config.py unset PSA_WANT_ALG_CTR
327+
scripts/config.py unset PSA_WANT_ALG_ECB_NO_PADDING
328+
scripts/config.py unset PSA_WANT_ALG_OFB
329+
scripts/config.py unset PSA_WANT_ALG_PBKDF2_AES_CMAC_PRF_128
330+
scripts/config.py unset PSA_WANT_ALG_STREAM_CIPHER
331+
scripts/config.py unset PSA_WANT_KEY_TYPE_DES
333332

334333
# The following modules directly depends on CIPHER_C
335334
scripts/config.py unset MBEDTLS_NIST_KW_C
@@ -357,7 +356,7 @@ component_test_full_no_ccm () {
357356
#
358357
# Note: also PSA_WANT_ALG_CCM_STAR_NO_TAG is enabled, but it does not cause
359358
# PSA_WANT_ALG_CCM to be re-enabled.
360-
scripts/config.py -f "$CRYPTO_CONFIG_H" unset PSA_WANT_ALG_CCM
359+
scripts/config.py unset PSA_WANT_ALG_CCM
361360

362361
make
363362

@@ -378,17 +377,17 @@ component_test_full_no_ccm_star_no_tag () {
378377
#
379378
# Note: PSA_WANT_ALG_CCM is enabled, but it does not cause
380379
# PSA_WANT_ALG_CCM_STAR_NO_TAG to be re-enabled.
381-
scripts/config.py -f "$CRYPTO_CONFIG_H" unset PSA_WANT_ALG_CCM_STAR_NO_TAG
382-
scripts/config.py -f "$CRYPTO_CONFIG_H" unset PSA_WANT_ALG_STREAM_CIPHER
383-
scripts/config.py -f "$CRYPTO_CONFIG_H" unset PSA_WANT_ALG_CTR
384-
scripts/config.py -f "$CRYPTO_CONFIG_H" unset PSA_WANT_ALG_CFB
385-
scripts/config.py -f "$CRYPTO_CONFIG_H" unset PSA_WANT_ALG_OFB
386-
scripts/config.py -f "$CRYPTO_CONFIG_H" unset PSA_WANT_ALG_ECB_NO_PADDING
380+
scripts/config.py unset PSA_WANT_ALG_CCM_STAR_NO_TAG
381+
scripts/config.py unset PSA_WANT_ALG_STREAM_CIPHER
382+
scripts/config.py unset PSA_WANT_ALG_CTR
383+
scripts/config.py unset PSA_WANT_ALG_CFB
384+
scripts/config.py unset PSA_WANT_ALG_OFB
385+
scripts/config.py unset PSA_WANT_ALG_ECB_NO_PADDING
387386
# NOTE unsettting PSA_WANT_ALG_ECB_NO_PADDING without unsetting NIST_KW_C will
388387
# mean PSA_WANT_ALG_ECB_NO_PADDING is re-enabled, so disabling it also.
389-
scripts/config.py -f "$CRYPTO_CONFIG_H" unset MBEDTLS_NIST_KW_C
390-
scripts/config.py -f "$CRYPTO_CONFIG_H" unset PSA_WANT_ALG_CBC_NO_PADDING
391-
scripts/config.py -f "$CRYPTO_CONFIG_H" unset PSA_WANT_ALG_CBC_PKCS7
388+
scripts/config.py unset MBEDTLS_NIST_KW_C
389+
scripts/config.py unset PSA_WANT_ALG_CBC_NO_PADDING
390+
scripts/config.py unset PSA_WANT_ALG_CBC_PKCS7
392391

393392
make
394393

@@ -434,18 +433,18 @@ component_test_everest_curve25519_only () {
434433
msg "build: Everest ECDH context, only Curve25519" # ~ 6 min
435434
scripts/config.py set MBEDTLS_ECDH_VARIANT_EVEREST_ENABLED
436435
scripts/config.py unset MBEDTLS_ECDSA_C
437-
scripts/config.py -c $CRYPTO_CONFIG_H unset PSA_WANT_ALG_DETERMINISTIC_ECDSA
438-
scripts/config.py -c $CRYPTO_CONFIG_H unset PSA_WANT_ALG_ECDSA
439-
scripts/config.py -c $CRYPTO_CONFIG_H set PSA_WANT_ALG_ECDH
436+
scripts/config.py unset PSA_WANT_ALG_DETERMINISTIC_ECDSA
437+
scripts/config.py unset PSA_WANT_ALG_ECDSA
438+
scripts/config.py set PSA_WANT_ALG_ECDH
440439
scripts/config.py unset MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA_ENABLED
441440
scripts/config.py unset MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED
442441
scripts/config.py unset MBEDTLS_ECJPAKE_C
443-
scripts/config.py -c $CRYPTO_CONFIG_H unset PSA_WANT_ALG_JPAKE
442+
scripts/config.py unset PSA_WANT_ALG_JPAKE
444443

445444
# Disable all curves
446445
scripts/config.py unset-all "MBEDTLS_ECP_DP_[0-9A-Z_a-z]*_ENABLED"
447-
scripts/config.py -c $CRYPTO_CONFIG_H unset-all "PSA_WANT_ECC_[0-9A-Z_a-z]*$"
448-
scripts/config.py -c $CRYPTO_CONFIG_H set PSA_WANT_ECC_MONTGOMERY_255
446+
scripts/config.py unset-all "PSA_WANT_ECC_[0-9A-Z_a-z]*$"
447+
scripts/config.py set PSA_WANT_ECC_MONTGOMERY_255
449448

450449
make CC=$ASAN_CC CFLAGS="$ASAN_CFLAGS" LDFLAGS="$ASAN_CFLAGS"
451450

@@ -541,10 +540,10 @@ component_test_psa_crypto_config_ffdh_2048_only () {
541540
scripts/config.py full
542541

543542
# Disable all DH groups other than 2048.
544-
scripts/config.py -f "$CRYPTO_CONFIG_H" unset PSA_WANT_DH_RFC7919_3072
545-
scripts/config.py -f "$CRYPTO_CONFIG_H" unset PSA_WANT_DH_RFC7919_4096
546-
scripts/config.py -f "$CRYPTO_CONFIG_H" unset PSA_WANT_DH_RFC7919_6144
547-
scripts/config.py -f "$CRYPTO_CONFIG_H" unset PSA_WANT_DH_RFC7919_8192
543+
scripts/config.py unset PSA_WANT_DH_RFC7919_3072
544+
scripts/config.py unset PSA_WANT_DH_RFC7919_4096
545+
scripts/config.py unset PSA_WANT_DH_RFC7919_6144
546+
scripts/config.py unset PSA_WANT_DH_RFC7919_8192
548547

549548
make CFLAGS="$ASAN_CFLAGS -Werror" LDFLAGS="$ASAN_CFLAGS"
550549

@@ -755,7 +754,7 @@ component_test_psa_crypto_config_accel_ecc_some_key_types () {
755754
scripts/config.py unset MBEDTLS_ECP_RESTARTABLE
756755

757756
# this is not supported by the driver API yet
758-
scripts/config.py -f "$CRYPTO_CONFIG_H" unset PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_DERIVE
757+
scripts/config.py unset PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_DERIVE
759758

760759
# Build
761760
# -----
@@ -849,7 +848,7 @@ common_test_psa_crypto_config_accel_ecc_some_curves () {
849848
scripts/config.py unset MBEDTLS_ECP_RESTARTABLE
850849

851850
# this is not supported by the driver API yet
852-
scripts/config.py -f "$CRYPTO_CONFIG_H" unset PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_DERIVE
851+
scripts/config.py unset PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_DERIVE
853852

854853
# Build
855854
# -----
@@ -1021,7 +1020,7 @@ config_psa_crypto_no_ecp_at_all () {
10211020
# Disable all the features that auto-enable ECP_LIGHT (see build_info.h)
10221021
scripts/config.py unset MBEDTLS_PK_PARSE_EC_EXTENDED
10231022
scripts/config.py unset MBEDTLS_PK_PARSE_EC_COMPRESSED
1024-
scripts/config.py -f "$CRYPTO_CONFIG_H" unset PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_DERIVE
1023+
scripts/config.py unset PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_DERIVE
10251024

10261025
# Restartable feature is not yet supported by PSA. Once it will in
10271026
# the future, the following line could be removed (see issues
@@ -1138,12 +1137,12 @@ config_psa_crypto_config_accel_ecc_ffdh_no_bignum () {
11381137
# Disable all the features that auto-enable ECP_LIGHT (see build_info.h)
11391138
scripts/config.py unset MBEDTLS_PK_PARSE_EC_EXTENDED
11401139
scripts/config.py unset MBEDTLS_PK_PARSE_EC_COMPRESSED
1141-
scripts/config.py -f "$CRYPTO_CONFIG_H" unset PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_DERIVE
1140+
scripts/config.py unset PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_DERIVE
11421141

11431142
# RSA support is intentionally disabled on this test because RSA_C depends
11441143
# on BIGNUM_C.
1145-
scripts/config.py -f "$CRYPTO_CONFIG_H" unset-all "PSA_WANT_KEY_TYPE_RSA_[0-9A-Z_a-z]*"
1146-
scripts/config.py -f "$CRYPTO_CONFIG_H" unset-all "PSA_WANT_ALG_RSA_[0-9A-Z_a-z]*"
1144+
scripts/config.py unset-all "PSA_WANT_KEY_TYPE_RSA_[0-9A-Z_a-z]*"
1145+
scripts/config.py unset-all "PSA_WANT_ALG_RSA_[0-9A-Z_a-z]*"
11471146
scripts/config.py unset MBEDTLS_X509_RSASSA_PSS_SUPPORT
11481147
# Also disable key exchanges that depend on RSA
11491148
scripts/config.py unset MBEDTLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED
@@ -1152,9 +1151,9 @@ config_psa_crypto_config_accel_ecc_ffdh_no_bignum () {
11521151
if [ "$test_target" = "ECC" ]; then
11531152
# When testing ECC only, we disable FFDH support, both from builtin and
11541153
# PSA sides.
1155-
scripts/config.py -f "$CRYPTO_CONFIG_H" unset PSA_WANT_ALG_FFDH
1156-
scripts/config.py -f "$CRYPTO_CONFIG_H" unset-all "PSA_WANT_KEY_TYPE_DH_[0-9A-Z_a-z]*"
1157-
scripts/config.py -f "$CRYPTO_CONFIG_H" unset-all "PSA_WANT_DH_RFC7919_[0-9]*"
1154+
scripts/config.py unset PSA_WANT_ALG_FFDH
1155+
scripts/config.py unset-all "PSA_WANT_KEY_TYPE_DH_[0-9A-Z_a-z]*"
1156+
scripts/config.py unset-all "PSA_WANT_DH_RFC7919_[0-9]*"
11581157
fi
11591158

11601159
# Restartable feature is not yet supported by PSA. Once it will in
@@ -1391,7 +1390,7 @@ build_and_test_psa_want_key_pair_partial () {
13911390

13921391
# All the PSA_WANT_KEY_TYPE_xxx_KEY_PAIR_yyy are enabled by default in
13931392
# crypto_config.h so we just disable the one we don't want.
1394-
scripts/config.py -f "$CRYPTO_CONFIG_H" unset "$disabled_psa_want"
1393+
scripts/config.py unset "$disabled_psa_want"
13951394

13961395
make CC=$ASAN_CC CFLAGS="$ASAN_CFLAGS" LDFLAGS="$ASAN_CFLAGS"
13971396

@@ -1502,9 +1501,9 @@ component_test_new_psa_want_key_pair_symbol () {
15021501

15031502
# Keep only PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_BASIC enabled in order to ensure
15041503
# that proper translations is done in crypto_legacy.h.
1505-
scripts/config.py -f "$CRYPTO_CONFIG_H" unset PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_IMPORT
1506-
scripts/config.py -f "$CRYPTO_CONFIG_H" unset PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_EXPORT
1507-
scripts/config.py -f "$CRYPTO_CONFIG_H" unset PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_GENERATE
1504+
scripts/config.py unset PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_IMPORT
1505+
scripts/config.py unset PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_EXPORT
1506+
scripts/config.py unset PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_GENERATE
15081507

15091508
make
15101509

@@ -1656,8 +1655,7 @@ config_psa_crypto_hmac_use_psa () {
16561655
scripts/config.py unset MBEDTLS_HMAC_DRBG_C
16571656
scripts/config.py unset MBEDTLS_HKDF_C
16581657
# Dependencies of HMAC_DRBG
1659-
scripts/config.py unset MBEDTLS_ECDSA_DETERMINISTIC
1660-
scripts/config.py -f "$CRYPTO_CONFIG_H" unset PSA_WANT_ALG_DETERMINISTIC_ECDSA
1658+
scripts/config.py unset PSA_WANT_ALG_DETERMINISTIC_ECDSA
16611659
}
16621660

16631661
component_test_psa_crypto_config_accel_hmac () {
@@ -1714,7 +1712,7 @@ component_test_psa_crypto_config_accel_aead () {
17141712
helper_libtestdriver1_adjust_config "full"
17151713

17161714
# Disable CCM_STAR_NO_TAG because this re-enables CCM_C.
1717-
scripts/config.py -f "$CRYPTO_CONFIG_H" unset PSA_WANT_ALG_CCM_STAR_NO_TAG
1715+
scripts/config.py unset PSA_WANT_ALG_CCM_STAR_NO_TAG
17181716

17191717
# Build
17201718
# -----
@@ -1830,14 +1828,14 @@ common_block_cipher_dispatch () {
18301828
# legacy key types to be re-enabled in "config_adjust_legacy_from_psa.h".
18311829
# Keep this also in the reference component in order to skip the same tests
18321830
# that were skipped in the accelerated one.
1833-
scripts/config.py -f "$CRYPTO_CONFIG_H" unset PSA_WANT_ALG_CTR
1834-
scripts/config.py -f "$CRYPTO_CONFIG_H" unset PSA_WANT_ALG_CFB
1835-
scripts/config.py -f "$CRYPTO_CONFIG_H" unset PSA_WANT_ALG_OFB
1836-
scripts/config.py -f "$CRYPTO_CONFIG_H" unset PSA_WANT_ALG_CBC_NO_PADDING
1837-
scripts/config.py -f "$CRYPTO_CONFIG_H" unset PSA_WANT_ALG_CBC_PKCS7
1838-
scripts/config.py -f "$CRYPTO_CONFIG_H" unset PSA_WANT_ALG_CMAC
1839-
scripts/config.py -f "$CRYPTO_CONFIG_H" unset PSA_WANT_ALG_CCM_STAR_NO_TAG
1840-
scripts/config.py -f "$CRYPTO_CONFIG_H" unset PSA_WANT_ALG_PBKDF2_AES_CMAC_PRF_128
1831+
scripts/config.py unset PSA_WANT_ALG_CTR
1832+
scripts/config.py unset PSA_WANT_ALG_CFB
1833+
scripts/config.py unset PSA_WANT_ALG_OFB
1834+
scripts/config.py unset PSA_WANT_ALG_CBC_NO_PADDING
1835+
scripts/config.py unset PSA_WANT_ALG_CBC_PKCS7
1836+
scripts/config.py unset PSA_WANT_ALG_CMAC
1837+
scripts/config.py unset PSA_WANT_ALG_CCM_STAR_NO_TAG
1838+
scripts/config.py unset PSA_WANT_ALG_PBKDF2_AES_CMAC_PRF_128
18411839

18421840
# Disable direct dependency on AES_C
18431841
scripts/config.py unset MBEDTLS_NIST_KW_C
@@ -1930,7 +1928,7 @@ component_test_full_block_cipher_legacy_dispatch () {
19301928
component_test_aead_chachapoly_disabled () {
19311929
msg "build: full minus CHACHAPOLY"
19321930
scripts/config.py full
1933-
scripts/config.py -f "$CRYPTO_CONFIG_H" unset PSA_WANT_ALG_CHACHA20_POLY1305
1931+
scripts/config.py unset PSA_WANT_ALG_CHACHA20_POLY1305
19341932
make CC=$ASAN_CC CFLAGS="$ASAN_CFLAGS" LDFLAGS="$ASAN_CFLAGS"
19351933

19361934
msg "test: full minus CHACHAPOLY"
@@ -1940,8 +1938,8 @@ component_test_aead_chachapoly_disabled () {
19401938
component_test_aead_only_ccm () {
19411939
msg "build: full minus CHACHAPOLY and GCM"
19421940
scripts/config.py full
1943-
scripts/config.py -f "$CRYPTO_CONFIG_H" unset PSA_WANT_ALG_CHACHA20_POLY1305
1944-
scripts/config.py -f "$CRYPTO_CONFIG_H" unset PSA_WANT_ALG_GCM
1941+
scripts/config.py unset PSA_WANT_ALG_CHACHA20_POLY1305
1942+
scripts/config.py unset PSA_WANT_ALG_GCM
19451943
make CC=$ASAN_CC CFLAGS="$ASAN_CFLAGS" LDFLAGS="$ASAN_CFLAGS"
19461944

19471945
msg "test: full minus CHACHAPOLY and GCM"
@@ -2067,10 +2065,10 @@ component_build_aes_variations () {
20672065
scripts/config.py set MBEDTLS_BLOCK_CIPHER_NO_DECRYPT
20682066
scripts/config.py unset MBEDTLS_NIST_KW_C
20692067

2070-
scripts/config.py -c $CRYPTO_CONFIG_H unset PSA_WANT_ALG_CBC_NO_PADDING
2071-
scripts/config.py -c $CRYPTO_CONFIG_H unset PSA_WANT_ALG_CBC_PKCS7
2072-
scripts/config.py -c $CRYPTO_CONFIG_H unset PSA_WANT_ALG_ECB_NO_PADDING
2073-
scripts/config.py -c $CRYPTO_CONFIG_H unset PSA_WANT_KEY_TYPE_DES
2068+
scripts/config.py unset PSA_WANT_ALG_CBC_NO_PADDING
2069+
scripts/config.py unset PSA_WANT_ALG_CBC_PKCS7
2070+
scripts/config.py unset PSA_WANT_ALG_ECB_NO_PADDING
2071+
scripts/config.py unset PSA_WANT_KEY_TYPE_DES
20742072

20752073
build_test_config_combos ${BUILTIN_SRC_PATH}/aes.o validate_aes_config_variations \
20762074
"MBEDTLS_AES_ROM_TABLES" \
@@ -2281,10 +2279,10 @@ config_block_cipher_no_decrypt () {
22812279

22822280
# Enable support for cryptographic mechanisms through the PSA API.
22832281
# Note: XTS, KW are not yet supported via the PSA API in Mbed TLS.
2284-
scripts/config.py -f "$CRYPTO_CONFIG_H" unset PSA_WANT_ALG_CBC_NO_PADDING
2285-
scripts/config.py -f "$CRYPTO_CONFIG_H" unset PSA_WANT_ALG_CBC_PKCS7
2286-
scripts/config.py -f "$CRYPTO_CONFIG_H" unset PSA_WANT_ALG_ECB_NO_PADDING
2287-
scripts/config.py -f "$CRYPTO_CONFIG_H" unset PSA_WANT_KEY_TYPE_DES
2282+
scripts/config.py unset PSA_WANT_ALG_CBC_NO_PADDING
2283+
scripts/config.py unset PSA_WANT_ALG_CBC_PKCS7
2284+
scripts/config.py unset PSA_WANT_ALG_ECB_NO_PADDING
2285+
scripts/config.py unset PSA_WANT_KEY_TYPE_DES
22882286
}
22892287

22902288
component_test_block_cipher_no_decrypt_aesni () {

0 commit comments

Comments
 (0)