commit 2824a209bcb7dc06c9ee61d15c998c8a4f4be21d
author Waleed Elmelegy <waleed.elmelegy@arm.com> Fri Feb 23 17:51:47 2024 +0000
committer Waleed Elmelegy <waleed.elmelegy@arm.com> Wed Mar 13 16:50:01 2024 +0000
tree 078405b4a2626bda21c5c0b3caf3ffce956833b4
parent 775c7768ee7a79ba9d2c7ea8d402a48de8bda431

Add ALPN information in session tickets

Signed-off-by: Waleed Elmelegy <waleed.elmelegy@arm.com>

tests/src/test_helpers/ssl_helpers.c

diff --git a/tests/src/test_helpers/ssl_helpers.c b/tests/src/test_helpers/ssl_helpers.c
index 56e03f1..89c1bbf 100644
--- a/tests/src/test_helpers/ssl_helpers.c
+++ b/tests/src/test_helpers/ssl_helpers.c
@@ -1793,7 +1793,14 @@
 
 #if defined(MBEDTLS_SSL_EARLY_DATA)
     session->max_early_data_size = 0x87654321;
-#endif
+#if defined(MBEDTLS_SSL_ALPN) && defined(MBEDTLS_SSL_SRV_C)
+    session->alpn = mbedtls_calloc(strlen("ALPNExample")+1, sizeof(char));
+    if (session->alpn == NULL) {
+        return -1;
+    }
+    strcpy(session->alpn, "ALPNExample");
+#endif /* MBEDTLS_SSL_ALPN && MBEDTLS_SSL_SRV_C */
+#endif /* MBEDTLS_SSL_EARLY_DATA */
 
 #if defined(MBEDTLS_HAVE_TIME) && defined(MBEDTLS_SSL_SRV_C)
     if (session->endpoint == MBEDTLS_SSL_IS_SERVER) {

tests/suites/test_suite_ssl.function

diff --git a/tests/suites/test_suite_ssl.function b/tests/suites/test_suite_ssl.function
index 8cf2105..da07f2c 100644
--- a/tests/suites/test_suite_ssl.function
+++ b/tests/suites/test_suite_ssl.function
@@ -2104,6 +2104,15 @@
 #if defined(MBEDTLS_SSL_EARLY_DATA)
         TEST_ASSERT(
             original.max_early_data_size == restored.max_early_data_size);
+#if defined(MBEDTLS_SSL_ALPN) && defined(MBEDTLS_SSL_SRV_C)
+        if (endpoint_type == MBEDTLS_SSL_IS_SERVER) {
+            TEST_ASSERT(original.alpn != NULL);
+            TEST_ASSERT(restored.alpn != NULL);
+            TEST_ASSERT(memcmp(original.alpn,
+                               restored.alpn,
+                               strlen(original.alpn)) == 0);
+        }
+#endif
 #endif
 
 #if defined(MBEDTLS_SSL_SESSION_TICKETS) && defined(MBEDTLS_SSL_CLI_C)