Merge pull request #10090 from valeriosetti/issue9618-development
[development] MBEDTLS_PLATFORM_GET_ENTROPY_ALT in 4.0
diff --git a/programs/ssl/ssl_context_info.c b/programs/ssl/ssl_context_info.c
index 0023814..7bcd50f 100644
--- a/programs/ssl/ssl_context_info.c
+++ b/programs/ssl/ssl_context_info.c
@@ -547,22 +547,10 @@
if (ciphersuite_info == NULL) {
printf_err("Cannot find ciphersuite info\n");
} else {
-#if defined(MBEDTLS_MD_C)
- const mbedtls_md_info_t *md_info;
-#endif
-
printf("\tciphersuite : %s\n", mbedtls_ssl_ciphersuite_get_name(ciphersuite_info));
printf("\tcipher flags : 0x%02X\n", ciphersuite_info->MBEDTLS_PRIVATE(flags));
printf("\tcipher type : %d\n", ciphersuite_info->MBEDTLS_PRIVATE(cipher));
-
-#if defined(MBEDTLS_MD_C)
- md_info = mbedtls_md_info_from_type(ciphersuite_info->MBEDTLS_PRIVATE(mac));
- if (md_info == NULL) {
- printf_err("Cannot find Message-Digest info\n");
- } else {
- printf("\tMessage-Digest : %s\n", mbedtls_md_get_name(md_info));
- }
-#endif /* MBEDTLS_MD_C */
+ printf("\tMessage-Digest : %d\n", ciphersuite_info->MBEDTLS_PRIVATE(mac));
}
CHECK_SSL_END(1);
diff --git a/programs/test/selftest.c b/programs/test/selftest.c
index 0a6faa7..5157573 100644
--- a/programs/test/selftest.c
+++ b/programs/test/selftest.c
@@ -305,9 +305,6 @@
#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
diff --git a/tests/context-info.sh b/tests/context-info.sh
index 066bd3d..4ad5e0c 100755
--- a/tests/context-info.sh
+++ b/tests/context-info.sh
@@ -205,7 +205,7 @@
-u "MBEDTLS_SSL_ALPN$" \
-u "ciphersuite.* TLS-ECDHE-RSA-WITH-CHACHA20-POLY1305-SHA256$" \
-u "cipher flags.* 0x00$" \
- -u "Message-Digest.* SHA256$" \
+ -u "Message-Digest.* 9$" \
-u "compression.* disabled$" \
-u "DTLS datagram packing.* enabled$" \
-n "Certificate" \
@@ -227,7 +227,7 @@
-u "MBEDTLS_SSL_ALPN$" \
-u "ciphersuite.* TLS-ECDHE-RSA-WITH-CHACHA20-POLY1305-SHA256$" \
-u "cipher flags.* 0x00$" \
- -u "Message-Digest.* SHA256$" \
+ -u "Message-Digest.* 9$" \
-u "compression.* disabled$" \
-u "DTLS datagram packing.* enabled$" \
-u "cert. version .* 3$" \
@@ -348,7 +348,7 @@
-u "minor.* 19$" \
-u "path.* 1$" \
-u "ciphersuite.* TLS-ECDHE-ECDSA-WITH-AES-128-CCM-8$" \
- -u "Message-Digest.* SHA256$" \
+ -u "Message-Digest.* 9$" \
-u "compression.* disabled$" \
-u "serial number.* 01:70:AF:40:B4:E6$" \
-u "issuer name.* CN=ca$" \
diff --git a/tests/scripts/components-configuration-crypto.sh b/tests/scripts/components-configuration-crypto.sh
index f5b3436..a06ef1d 100644
--- a/tests/scripts/components-configuration-crypto.sh
+++ b/tests/scripts/components-configuration-crypto.sh
@@ -382,6 +382,9 @@
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
diff --git a/tests/scripts/depends.py b/tests/scripts/depends.py
index 816d2de..5e025ba 100755
--- a/tests/scripts/depends.py
+++ b/tests/scripts/depends.py
@@ -350,6 +350,7 @@
'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.