mirror of
https://github.com/Mbed-TLS/mbedtls.git
synced 2025-03-29 22:20:30 +00:00
ssl-opt: set proper cipher dependencies in tests using ticket_aead parameters
Check either legacy or PSA symbols based on USE_PSA_CRYPTO Signed-off-by: Valerio Setti <valerio.setti@nordicsemi.no>
This commit is contained in:
Valerio Setti
parent
38e75fb1a7
commit
73d053123f
@ -368,6 +368,34 @@ requires_ciphersuite_enabled() {
|
||||
esac
|
||||
}
|
||||
|
||||
requires_cipher_enabled() {
|
||||
KEY_TYPE=$1
|
||||
MODE=${2:-}
|
||||
if is_config_enabled MBEDTLS_USE_PSA_CRYPTO; then
|
||||
case "$KEY_TYPE" in
|
||||
CHACHA20)
|
||||
requires_config_enabled PSA_WANT_ALG_CHACHA20_POLY1305
|
||||
requires_config_enabled PSA_WANT_KEY_TYPE_CHACHA20
|
||||
;;
|
||||
*)
|
||||
requires_config_enabled PSA_WANT_ALG_${MODE}
|
||||
requires_config_enabled PSA_WANT_KEY_TYPE_${KEY_TYPE}
|
||||
;;
|
||||
esac
|
||||
else
|
||||
case "$KEY_TYPE" in
|
||||
CHACHA20)
|
||||
requires_config_enabled MBEDTLS_CHACHA20_C
|
||||
requires_config_enabled MBEDTLS_CHACHAPOLY_C
|
||||
;;
|
||||
*)
|
||||
requires_config_enabled MBEDTLS_${MODE}_C
|
||||
requires_config_enabled MBEDTLS_${KEY_TYPE}_C
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
}
|
||||
|
||||
# Automatically detect required features based on command line parameters.
|
||||
# Parameters are:
|
||||
# - $1 = command line (call to a TLS client or server program)
|
||||
@ -3848,6 +3876,7 @@ run_test "Session resume using tickets: openssl client" \
|
||||
-s "session successfully restored from ticket" \
|
||||
-s "a session has been resumed"
|
||||
|
||||
requires_cipher_enabled "AES" "GCM"
|
||||
run_test "Session resume using tickets: AES-128-GCM" \
|
||||
"$P_SRV debug_level=3 tickets=1 ticket_aead=AES-128-GCM" \
|
||||
"$P_CLI force_version=tls12 debug_level=3 tickets=1 reconnect=1" \
|
||||
@ -3862,6 +3891,7 @@ run_test "Session resume using tickets: AES-128-GCM" \
|
||||
-s "a session has been resumed" \
|
||||
-c "a session has been resumed"
|
||||
|
||||
requires_cipher_enabled "AES" "GCM"
|
||||
run_test "Session resume using tickets: AES-192-GCM" \
|
||||
"$P_SRV debug_level=3 tickets=1 ticket_aead=AES-192-GCM" \
|
||||
"$P_CLI force_version=tls12 debug_level=3 tickets=1 reconnect=1" \
|
||||
@ -3876,6 +3906,7 @@ run_test "Session resume using tickets: AES-192-GCM" \
|
||||
-s "a session has been resumed" \
|
||||
-c "a session has been resumed"
|
||||
|
||||
requires_cipher_enabled "AES" "CCM"
|
||||
run_test "Session resume using tickets: AES-128-CCM" \
|
||||
"$P_SRV debug_level=3 tickets=1 ticket_aead=AES-128-CCM" \
|
||||
"$P_CLI force_version=tls12 debug_level=3 tickets=1 reconnect=1" \
|
||||
@ -3890,6 +3921,7 @@ run_test "Session resume using tickets: AES-128-CCM" \
|
||||
-s "a session has been resumed" \
|
||||
-c "a session has been resumed"
|
||||
|
||||
requires_cipher_enabled "AES" "CCM"
|
||||
run_test "Session resume using tickets: AES-192-CCM" \
|
||||
"$P_SRV debug_level=3 tickets=1 ticket_aead=AES-192-CCM" \
|
||||
"$P_CLI force_version=tls12 debug_level=3 tickets=1 reconnect=1" \
|
||||
@ -3904,6 +3936,7 @@ run_test "Session resume using tickets: AES-192-CCM" \
|
||||
-s "a session has been resumed" \
|
||||
-c "a session has been resumed"
|
||||
|
||||
requires_cipher_enabled "AES" "CCM"
|
||||
run_test "Session resume using tickets: AES-256-CCM" \
|
||||
"$P_SRV debug_level=3 tickets=1 ticket_aead=AES-256-CCM" \
|
||||
"$P_CLI force_version=tls12 debug_level=3 tickets=1 reconnect=1" \
|
||||
@ -3918,6 +3951,7 @@ run_test "Session resume using tickets: AES-256-CCM" \
|
||||
-s "a session has been resumed" \
|
||||
-c "a session has been resumed"
|
||||
|
||||
requires_cipher_enabled "CAMELLIA" "CCM"
|
||||
run_test "Session resume using tickets: CAMELLIA-128-CCM" \
|
||||
"$P_SRV debug_level=3 tickets=1 ticket_aead=CAMELLIA-128-CCM" \
|
||||
"$P_CLI force_version=tls12 debug_level=3 tickets=1 reconnect=1" \
|
||||
@ -3932,6 +3966,7 @@ run_test "Session resume using tickets: CAMELLIA-128-CCM" \
|
||||
-s "a session has been resumed" \
|
||||
-c "a session has been resumed"
|
||||
|
||||
requires_cipher_enabled "CAMELLIA" "CCM"
|
||||
run_test "Session resume using tickets: CAMELLIA-192-CCM" \
|
||||
"$P_SRV debug_level=3 tickets=1 ticket_aead=CAMELLIA-192-CCM" \
|
||||
"$P_CLI force_version=tls12 debug_level=3 tickets=1 reconnect=1" \
|
||||
@ -3946,6 +3981,7 @@ run_test "Session resume using tickets: CAMELLIA-192-CCM" \
|
||||
-s "a session has been resumed" \
|
||||
-c "a session has been resumed"
|
||||
|
||||
requires_cipher_enabled "CAMELLIA" "CCM"
|
||||
run_test "Session resume using tickets: CAMELLIA-256-CCM" \
|
||||
"$P_SRV debug_level=3 tickets=1 ticket_aead=CAMELLIA-256-CCM" \
|
||||
"$P_CLI force_version=tls12 debug_level=3 tickets=1 reconnect=1" \
|
||||
@ -3960,6 +3996,7 @@ run_test "Session resume using tickets: CAMELLIA-256-CCM" \
|
||||
-s "a session has been resumed" \
|
||||
-c "a session has been resumed"
|
||||
|
||||
requires_cipher_enabled "ARIA" "CCM"
|
||||
run_test "Session resume using tickets: ARIA-128-GCM" \
|
||||
"$P_SRV debug_level=3 tickets=1 ticket_aead=ARIA-128-GCM" \
|
||||
"$P_CLI force_version=tls12 debug_level=3 tickets=1 reconnect=1" \
|
||||
@ -3974,6 +4011,7 @@ run_test "Session resume using tickets: ARIA-128-GCM" \
|
||||
-s "a session has been resumed" \
|
||||
-c "a session has been resumed"
|
||||
|
||||
requires_cipher_enabled "ARIA" "CCM"
|
||||
run_test "Session resume using tickets: ARIA-192-GCM" \
|
||||
"$P_SRV debug_level=3 tickets=1 ticket_aead=ARIA-192-GCM" \
|
||||
"$P_CLI force_version=tls12 debug_level=3 tickets=1 reconnect=1" \
|
||||
@ -3988,6 +4026,7 @@ run_test "Session resume using tickets: ARIA-192-GCM" \
|
||||
-s "a session has been resumed" \
|
||||
-c "a session has been resumed"
|
||||
|
||||
requires_cipher_enabled "ARIA" "CCM"
|
||||
run_test "Session resume using tickets: ARIA-256-GCM" \
|
||||
"$P_SRV debug_level=3 tickets=1 ticket_aead=ARIA-256-GCM" \
|
||||
"$P_CLI force_version=tls12 debug_level=3 tickets=1 reconnect=1" \
|
||||
@ -4002,6 +4041,7 @@ run_test "Session resume using tickets: ARIA-256-GCM" \
|
||||
-s "a session has been resumed" \
|
||||
-c "a session has been resumed"
|
||||
|
||||
requires_cipher_enabled "ARIA" "CCM"
|
||||
run_test "Session resume using tickets: ARIA-128-CCM" \
|
||||
"$P_SRV debug_level=3 tickets=1 ticket_aead=ARIA-128-CCM" \
|
||||
"$P_CLI force_version=tls12 debug_level=3 tickets=1 reconnect=1" \
|
||||
@ -4016,6 +4056,7 @@ run_test "Session resume using tickets: ARIA-128-CCM" \
|
||||
-s "a session has been resumed" \
|
||||
-c "a session has been resumed"
|
||||
|
||||
requires_cipher_enabled "ARIA" "CCM"
|
||||
run_test "Session resume using tickets: ARIA-192-CCM" \
|
||||
"$P_SRV debug_level=3 tickets=1 ticket_aead=ARIA-192-CCM" \
|
||||
"$P_CLI force_version=tls12 debug_level=3 tickets=1 reconnect=1" \
|
||||
@ -4030,6 +4071,7 @@ run_test "Session resume using tickets: ARIA-192-CCM" \
|
||||
-s "a session has been resumed" \
|
||||
-c "a session has been resumed"
|
||||
|
||||
requires_cipher_enabled "ARIA" "CCM"
|
||||
run_test "Session resume using tickets: ARIA-256-CCM" \
|
||||
"$P_SRV debug_level=3 tickets=1 ticket_aead=ARIA-256-CCM" \
|
||||
"$P_CLI force_version=tls12 debug_level=3 tickets=1 reconnect=1" \
|
||||
@ -4044,6 +4086,7 @@ run_test "Session resume using tickets: ARIA-256-CCM" \
|
||||
-s "a session has been resumed" \
|
||||
-c "a session has been resumed"
|
||||
|
||||
requires_cipher_enabled "CHACHA20"
|
||||
run_test "Session resume using tickets: CHACHA20-POLY1305" \
|
||||
"$P_SRV debug_level=3 tickets=1 ticket_aead=CHACHA20-POLY1305" \
|
||||
"$P_CLI force_version=tls12 debug_level=3 tickets=1 reconnect=1" \
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user