lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-08-08 17:42:09 +03:00
Code Activity

ssl-opt.sh: Remove dependencies on built-in CBC and AES

Browse Source 
Remove dependencies on MBEDTLS_CIPHER_MODE_CBC and
MBEDTLS_AES_C, as these options will no longer be
available once they are removed from the configuration.

The affected tests rely on the built-in CBC and AES
implementations. With the removal of
MBEDTLS_CIPHER_MODE_CBC and MBEDTLS_AES_C as
configuration options, there is no longer a mechanism
in ssl-opt.sh to express these dependencies.

As a result, filter out these tests at the all.sh
component level when the built-in CBC and AES
implementations are not available.

Signed-off-by: Ronald Cron <ronald.cron@arm.com>
This commit is contained in:
Ronald Cron
2025-07-10 09:53:50 +02:00
parent d5da020a63
commit bd28acf240
2 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/scripts/components-configuration-crypto.sh
View File

@@ -1894,7 +1894,8 @@ component_test_psa_crypto_config_accel_cipher_aead_cmac () {
make test make test
msg "ssl-opt: full config with accelerated cipher inc. AEAD and CMAC" msg "ssl-opt: full config with accelerated cipher inc. AEAD and CMAC"
tests/ssl-opt.sh # Exclude password-protected key tests — they require built-in CBC and AES.
tests/ssl-opt.sh -e "TLS: password protected"
msg "compat.sh: full config with accelerated cipher inc. AEAD and CMAC" msg "compat.sh: full config with accelerated cipher inc. AEAD and CMAC"
tests/compat.sh -V NO -p mbedTLS tests/compat.sh -V NO -p mbedTLS
@@ -1910,7 +1911,8 @@ component_test_psa_crypto_config_reference_cipher_aead_cmac () {
make test make test
msg "ssl-opt: full config with non-accelerated cipher inc. AEAD and CMAC" msg "ssl-opt: full config with non-accelerated cipher inc. AEAD and CMAC"
tests/ssl-opt.sh # Exclude password-protected key tests as in test_psa_crypto_config_accel_cipher_aead_cmac.
tests/ssl-opt.sh -e "TLS: password protected"
msg "compat.sh: full config with non-accelerated cipher inc. AEAD and CMAC" msg "compat.sh: full config with non-accelerated cipher inc. AEAD and CMAC"
tests/compat.sh -V NO -p mbedTLS tests/compat.sh -V NO -p mbedTLS

21
tests/ssl-opt.sh
View File

@@ -2245,9 +2245,10 @@ run_test "key size: TLS-ECDHE-ECDSA-WITH-AES-128-CCM-8" \
requires_config_enabled MBEDTLS_X509_CRT_PARSE_C requires_config_enabled MBEDTLS_X509_CRT_PARSE_C
# server5.key.enc is in PEM format and AES-256-CBC crypted. Unfortunately PEM # server5.key.enc is in PEM format and AES-256-CBC crypted. Unfortunately PEM
# module does not support PSA dispatching so we need builtin support. # module does not support PSA dispatching so we need builtin support. With the
requires_config_enabled MBEDTLS_CIPHER_MODE_CBC # removal of the legacy cryptography configuration options, there is currently
requires_config_enabled MBEDTLS_AES_C # no way to express this dependency. This test fails if run in a configuration
# where the built-in implementation of CBC or AES is not present.
requires_hash_alg MD5 requires_hash_alg MD5
requires_hash_alg SHA_256 requires_hash_alg SHA_256
run_test "TLS: password protected client key" \ run_test "TLS: password protected client key" \
@@ -2257,9 +2258,10 @@ run_test "TLS: password protected client key" \
requires_config_enabled MBEDTLS_X509_CRT_PARSE_C requires_config_enabled MBEDTLS_X509_CRT_PARSE_C
# server5.key.enc is in PEM format and AES-256-CBC crypted. Unfortunately PEM # server5.key.enc is in PEM format and AES-256-CBC crypted. Unfortunately PEM
# module does not support PSA dispatching so we need builtin support. # module does not support PSA dispatching so we need builtin support. With the
requires_config_enabled MBEDTLS_CIPHER_MODE_CBC # removal of the legacy cryptography configuration options, there is currently
requires_config_enabled MBEDTLS_AES_C # no way to express this dependency. This test fails if run in a configuration
# where the built-in implementation of CBC or AES is not present.
requires_hash_alg MD5 requires_hash_alg MD5
requires_hash_alg SHA_256 requires_hash_alg SHA_256
run_test "TLS: password protected server key" \ run_test "TLS: password protected server key" \
@@ -2270,9 +2272,10 @@ run_test "TLS: password protected server key" \
requires_config_enabled MBEDTLS_X509_CRT_PARSE_C requires_config_enabled MBEDTLS_X509_CRT_PARSE_C
requires_config_enabled MBEDTLS_RSA_C requires_config_enabled MBEDTLS_RSA_C
# server5.key.enc is in PEM format and AES-256-CBC crypted. Unfortunately PEM # server5.key.enc is in PEM format and AES-256-CBC crypted. Unfortunately PEM
# module does not support PSA dispatching so we need builtin support. # module does not support PSA dispatching so we need builtin support. With the
requires_config_enabled MBEDTLS_CIPHER_MODE_CBC # removal of the legacy cryptography configuration options, there is currently
requires_config_enabled MBEDTLS_AES_C # no way to express this dependency. This test fails if run in a configuration
# where the built-in implementation of CBC or AES is not present.
requires_hash_alg MD5 requires_hash_alg MD5
requires_hash_alg SHA_256 requires_hash_alg SHA_256
run_test "TLS: password protected server key, two certificates" \ run_test "TLS: password protected server key, two certificates" \