commit c740345c5b2f4aa5119bbb91951cc258053f0112
author XiaokangQian <xiaokang.qian@arm.com> Thu Jun 23 03:24:12 2022 +0000
committer XiaokangQian <xiaokang.qian@arm.com> Thu Jun 23 03:24:12 2022 +0000
tree 70b1d5fc6704773613b8a8b01c27380e097a187e
parent acb3992251de1879a624eceb18d3c4661c63c80e

Adress review comments

Change Code styles
Add test cases

Change-Id: I022bfc66fe509fe767319c4fe5f2541ee05e96fd
Signed-off-by: XiaokangQian <xiaokang.qian@arm.com>

tests/ssl-opt.sh

diff --git a/tests/ssl-opt.sh b/tests/ssl-opt.sh
index 0791823..0178e7e 100755
--- a/tests/ssl-opt.sh
+++ b/tests/ssl-opt.sh
@@ -10520,16 +10520,22 @@
             "$P_SRV debug_level=3 tickets=0 crt_file=data_files/server5.crt key_file=data_files/server5.key force_version=tls13 alpn=h2" \
             "$O_NEXT_CLI -msg -tls1_3 -no_middlebox -alpn h2" \
             0 \
-            -s "server state: MBEDTLS_SSL_HELLO_REQUEST" \
-            -s "server state: MBEDTLS_SSL_SERVER_HELLO" \
-            -s "server state: MBEDTLS_SSL_ENCRYPTED_EXTENSIONS" \
-            -s "server state: MBEDTLS_SSL_CERTIFICATE_REQUEST" \
-            -s "server state: MBEDTLS_SSL_SERVER_CERTIFICATE" \
-            -s "server state: MBEDTLS_SSL_CERTIFICATE_VERIFY" \
-            -s "server state: MBEDTLS_SSL_SERVER_FINISHED" \
-            -s "server state: MBEDTLS_SSL_CLIENT_FINISHED" \
-            -s "server state: MBEDTLS_SSL_HANDSHAKE_WRAPUP" \
-            -s "<= parse client hello" \
+            -s "found alpn extension" \
+            -s "server side, adding alpn extension" \
+            -s "Protocol is TLSv1.3" \
+            -s "HTTP/1.0 200 OK" \
+            -s "Application Layer Protocol is h2"
+
+requires_gnutls_tls1_3
+requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
+requires_config_enabled MBEDTLS_SSL_TLS1_3_COMPATIBILITY_MODE
+requires_config_enabled MBEDTLS_DEBUG_C
+requires_config_enabled MBEDTLS_SSL_CLI_C
+requires_config_enabled MBEDTLS_SSL_ALPN
+run_test    "TLS 1.3: server alpn - gnutls" \
+            "$P_SRV debug_level=3 tickets=0 crt_file=data_files/server5.crt key_file=data_files/server5.key force_version=tls13 alpn=h2" \
+            "$G_NEXT_CLI localhost -d 4 --priority=NORMAL:-VERS-ALL:+VERS-TLS1.3:%NO_TICKETS:%DISABLE_TLS13_COMPAT_MODE -V --alpn h2" \
+            0 \
             -s "found alpn extension" \
             -s "server side, adding alpn extension" \
             -s "Protocol is TLSv1.3" \