mirror of
https://github.com/Mbed-TLS/mbedtls.git
synced 2026-05-09 03:04:24 +02:00
Merge pull request #9983 from bjwtaylor/kw-api-rework
Move NIST_KW to PSA API
This commit is contained in:
@@ -309,9 +309,6 @@ const selftest_t selftests[] =
|
||||
#if defined(MBEDTLS_CCM_C) && defined(MBEDTLS_AES_C)
|
||||
{ "ccm", mbedtls_ccm_self_test },
|
||||
#endif
|
||||
#if defined(MBEDTLS_NIST_KW_C) && defined(MBEDTLS_AES_C)
|
||||
{ "nist_kw", mbedtls_nist_kw_self_test },
|
||||
#endif
|
||||
#if defined(MBEDTLS_CMAC_C)
|
||||
{ "cmac", mbedtls_cmac_self_test },
|
||||
#endif
|
||||
|
||||
@@ -382,6 +382,9 @@ component_test_full_no_ccm_star_no_tag () {
|
||||
scripts/config.py -f "$CRYPTO_CONFIG_H" unset PSA_WANT_ALG_CFB
|
||||
scripts/config.py -f "$CRYPTO_CONFIG_H" unset PSA_WANT_ALG_OFB
|
||||
scripts/config.py -f "$CRYPTO_CONFIG_H" unset PSA_WANT_ALG_ECB_NO_PADDING
|
||||
# NOTE unsettting PSA_WANT_ALG_ECB_NO_PADDING without unsetting NIST_KW_C will
|
||||
# mean PSA_WANT_ALG_ECB_NO_PADDING is re-enabled, so disabling it also.
|
||||
scripts/config.py -f "$CRYPTO_CONFIG_H" unset MBEDTLS_NIST_KW_C
|
||||
scripts/config.py -f "$CRYPTO_CONFIG_H" unset PSA_WANT_ALG_CBC_NO_PADDING
|
||||
scripts/config.py -f "$CRYPTO_CONFIG_H" unset PSA_WANT_ALG_CBC_PKCS7
|
||||
|
||||
|
||||
@@ -350,6 +350,7 @@ REVERSE_DEPENDENCIES = {
|
||||
'PSA_WANT_ALG_SHA3_256',
|
||||
'PSA_WANT_ALG_SHA3_384',
|
||||
'PSA_WANT_ALG_SHA3_512'],
|
||||
'PSA_WANT_ALG_ECB_NO_PADDING' : ['MBEDTLS_NIST_KW_C'],
|
||||
}
|
||||
|
||||
# If an option is tested in an exclusive test, alter the following defines.
|
||||
|
||||
Reference in New Issue
Block a user