mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-03-29 22:20:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added support for MD5 in requires_hash_alg

Browse Source 
Signed-off-by: Sam Berry <sam.berry@arm.com>
This commit is contained in:
Sam Berry 2024-06-19 11:43:03 +01:00
parent 71b58180cd
commit 06b91be210
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tests/ssl-opt.sh
View File

@ -593,6 +593,7 @@ case " $CONFIGS_ENABLED " in
*) PSK_ONLY="NO";; *) PSK_ONLY="NO";;
esac esac
HAS_ALG_MD5="NO"
HAS_ALG_SHA_1="NO" HAS_ALG_SHA_1="NO"
HAS_ALG_SHA_224="NO" HAS_ALG_SHA_224="NO"
HAS_ALG_SHA_256="NO" HAS_ALG_SHA_256="NO"
@ -611,7 +612,10 @@ check_for_hash_alg()
else else
CURR_ALG=MBEDTLS_${1}_C CURR_ALG=MBEDTLS_${1}_C
# Remove the second underscore to match MBEDTLS_* naming convention # Remove the second underscore to match MBEDTLS_* naming convention
CURR_ALG=$(echo "$CURR_ALG" | sed 's/_//2') # MD5 is an exception to this convention
if [ "${1}" != "MD5" ]; then
CURR_ALG=$(echo "$CURR_ALG" | sed 's/_//2')
fi
fi fi
case $CONFIGS_ENABLED in case $CONFIGS_ENABLED in
@ -625,7 +629,7 @@ check_for_hash_alg()
populate_enabled_hash_algs() populate_enabled_hash_algs()
{ {
for hash_alg in SHA_1 SHA_224 SHA_256 SHA_384 SHA_512; do for hash_alg in SHA_1 SHA_224 SHA_256 SHA_384 SHA_512 MD5; do
if check_for_hash_alg "$hash_alg"; then if check_for_hash_alg "$hash_alg"; then
hash_alg_variable=HAS_ALG_${hash_alg} hash_alg_variable=HAS_ALG_${hash_alg}
eval ${hash_alg_variable}=YES eval ${hash_alg_variable}=YES
@ -638,6 +642,7 @@ requires_hash_alg() {
HASH_DEFINE="Invalid" HASH_DEFINE="Invalid"
HAS_HASH_ALG="NO" HAS_HASH_ALG="NO"
case $1 in case $1 in
MD5):;;
SHA_1):;; SHA_1):;;
SHA_224):;; SHA_224):;;
SHA_256):;; SHA_256):;;
@ -2107,11 +2112,11 @@ run_test "key size: TLS-ECDHE-ECDSA-WITH-AES-128-CCM-8" \
-c "Key size is 128" -c "Key size is 128"
requires_config_enabled MBEDTLS_X509_CRT_PARSE_C requires_config_enabled MBEDTLS_X509_CRT_PARSE_C
requires_config_enabled MBEDTLS_MD_CAN_MD5
# 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.
requires_config_enabled MBEDTLS_CIPHER_MODE_CBC requires_config_enabled MBEDTLS_CIPHER_MODE_CBC
requires_config_enabled MBEDTLS_AES_C requires_config_enabled MBEDTLS_AES_C
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" \
"$P_SRV force_version=tls12 auth_mode=required" \ "$P_SRV force_version=tls12 auth_mode=required" \
@ -2119,11 +2124,11 @@ run_test "TLS: password protected client key" \
0 0
requires_config_enabled MBEDTLS_X509_CRT_PARSE_C requires_config_enabled MBEDTLS_X509_CRT_PARSE_C
requires_config_enabled MBEDTLS_MD_CAN_MD5
# 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.
requires_config_enabled MBEDTLS_CIPHER_MODE_CBC requires_config_enabled MBEDTLS_CIPHER_MODE_CBC
requires_config_enabled MBEDTLS_AES_C requires_config_enabled MBEDTLS_AES_C
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" \
"$P_SRV crt_file=data_files/server5.crt key_file=data_files/server5.key.enc key_pwd=PolarSSLTest" \ "$P_SRV crt_file=data_files/server5.crt key_file=data_files/server5.key.enc key_pwd=PolarSSLTest" \
@ -2132,11 +2137,11 @@ 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
requires_config_enabled MBEDTLS_MD_CAN_MD5
# 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.
requires_config_enabled MBEDTLS_CIPHER_MODE_CBC requires_config_enabled MBEDTLS_CIPHER_MODE_CBC
requires_config_enabled MBEDTLS_AES_C requires_config_enabled MBEDTLS_AES_C
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" \
"$P_SRV force_version=tls12\ "$P_SRV force_version=tls12\