From 6622049bcc5defbf59aec7d2c6c1a81c5384315b Mon Sep 17 00:00:00 2001 From: Jerry Yu Date: Sat, 23 Apr 2022 13:53:36 +0800 Subject: [PATCH] test:add state check Signed-off-by: Jerry Yu --- tests/ssl-opt.sh | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/tests/ssl-opt.sh b/tests/ssl-opt.sh index 238821a383..c80dcec177 100755 --- a/tests/ssl-opt.sh +++ b/tests/ssl-opt.sh @@ -81,7 +81,7 @@ fi if [ -n "${OPENSSL_NEXT:-}" ]; then O_NEXT_SRV="$OPENSSL_NEXT s_server -www -cert data_files/server5.crt -key data_files/server5.key" O_NEXT_SRV_NO_CERT="$OPENSSL_NEXT s_server -www " - O_NEXT_CLI="echo 'GET / HTTP/1.0' | $OPENSSL_NEXT s_client" + O_NEXT_CLI="echo 'GET / HTTP/1.0' | $OPENSSL_NEXT s_client -CAfile data_files/test-ca_cat12.crt" else O_NEXT_SRV=false O_NEXT_SRV_NO_CERT=false @@ -11200,7 +11200,7 @@ requires_config_enabled MBEDTLS_SSL_SRV_C requires_openssl_tls1_3 run_test "TLS 1.3: Server side check - openssl" \ "$P_SRV debug_level=4 crt_file=data_files/server5.crt key_file=data_files/server5.key force_version=tls13 tickets=0" \ - "$O_NEXT_CLI -msg -debug -tls1_3" \ + "$O_NEXT_CLI -msg -debug -tls1_3 -no_middlebox" \ 0 \ -s "tls13 server state: MBEDTLS_SSL_CLIENT_HELLO" \ -s "tls13 server state: MBEDTLS_SSL_SERVER_HELLO" \ @@ -11208,9 +11208,9 @@ run_test "TLS 1.3: Server side check - openssl" \ -s "tls13 server state: MBEDTLS_SSL_SERVER_CERTIFICATE" \ -s "tls13 server state: MBEDTLS_SSL_CERTIFICATE_VERIFY" \ -s "tls13 server state: MBEDTLS_SSL_SERVER_FINISHED" \ - -s "SSL - The requested feature is not available" \ - -s "=> parse client hello" \ - -s "<= parse client hello" + -s "tls13 server state: MBEDTLS_SSL_CLIENT_FINISHED" \ + -s "tls13 server state: MBEDTLS_SSL_HANDSHAKE_WRAPUP" \ + -c "DONE" requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3 requires_config_enabled MBEDTLS_DEBUG_C @@ -11240,16 +11240,16 @@ requires_config_enabled MBEDTLS_SSL_SRV_C run_test "TLS 1.3: Server side check - gnutls" \ "$P_SRV debug_level=4 crt_file=data_files/server5.crt key_file=data_files/server5.key force_version=tls13 tickets=0" \ "$G_NEXT_CLI localhost -d 4 --priority=NORMAL:-VERS-ALL:+VERS-TLS1.3:%NO_TICKETS:%DISABLE_TLS13_COMPAT_MODE -V" \ - 1 \ + 0 \ -s "tls13 server state: MBEDTLS_SSL_CLIENT_HELLO" \ -s "tls13 server state: MBEDTLS_SSL_SERVER_HELLO" \ -s "tls13 server state: MBEDTLS_SSL_ENCRYPTED_EXTENSIONS" \ -s "tls13 server state: MBEDTLS_SSL_SERVER_CERTIFICATE" \ -s "tls13 server state: MBEDTLS_SSL_CERTIFICATE_VERIFY" \ -s "tls13 server state: MBEDTLS_SSL_SERVER_FINISHED" \ - -s "SSL - The requested feature is not available" \ - -s "=> parse client hello" \ - -s "<= parse client hello" + -s "tls13 server state: MBEDTLS_SSL_CLIENT_FINISHED" \ + -s "tls13 server state: MBEDTLS_SSL_HANDSHAKE_WRAPUP" \ + -c "HTTP/1.0 200 OK" requires_gnutls_tls1_3 requires_gnutls_next_no_ticket @@ -11279,7 +11279,7 @@ requires_config_enabled MBEDTLS_SSL_CLI_C run_test "TLS 1.3: Server side check - mbedtls" \ "$P_SRV debug_level=4 crt_file=data_files/server5.crt key_file=data_files/server5.key force_version=tls13 tickets=0" \ "$P_CLI debug_level=4 force_version=tls13" \ - 1 \ + 0 \ -s "tls13 server state: MBEDTLS_SSL_CLIENT_HELLO" \ -s "tls13 server state: MBEDTLS_SSL_SERVER_HELLO" \ -s "tls13 server state: MBEDTLS_SSL_ENCRYPTED_EXTENSIONS" \ @@ -11305,10 +11305,9 @@ run_test "TLS 1.3: Server side check - mbedtls with client authentication" \ -s "tls13 server state: MBEDTLS_SSL_SERVER_CERTIFICATE" \ -s "tls13 server state: MBEDTLS_SSL_CERTIFICATE_VERIFY" \ -s "tls13 server state: MBEDTLS_SSL_SERVER_FINISHED" \ - -c "client state: MBEDTLS_SSL_CERTIFICATE_REQUEST" \ - -s "SSL - The requested feature is not available" \ - -s "=> parse client hello" \ - -s "<= parse client hello" + -s "tls13 server state: MBEDTLS_SSL_CLIENT_FINISHED" \ + -s "tls13 server state: MBEDTLS_SSL_HANDSHAKE_WRAPUP" \ + -c "HTTP/1.0 200 OK" requires_config_enabled MBEDTLS_DEBUG_C