From 02451dcc658d397381b16a574c2c68d441e92b33 Mon Sep 17 00:00:00 2001
From: Ben Taylor <ben.taylor@linaro.org>
Date: Thu, 7 May 2026 17:23:55 +0100
Subject: [PATCH] Add test for leak

Signed-off-by: Ben Taylor <ben.taylor@linaro.org>
---
 tests/suites/test_suite_ssl.data     |  4 ++
 tests/suites/test_suite_ssl.function | 91 ++++++++++++++++++++++++++++
 2 files changed, 95 insertions(+)

diff --git a/tests/suites/test_suite_ssl.data b/tests/suites/test_suite_ssl.data
index a117fede2a..24cb8f2217 100644
--- a/tests/suites/test_suite_ssl.data
+++ b/tests/suites/test_suite_ssl.data
@@ -3563,3 +3563,7 @@ send_invalid_sig_alg:MBEDTLS_SSL_SIG_ECDSA:MBEDTLS_SSL_HASH_SHA512:MBEDTLS_ERR_S
 
 Default verify_result before doing a handshake
 verify_result_without_handshake
+
+TLS 1.2 NewSessionTicket: failing ticket callback leaves lifetime unset
+depends_on:MBEDTLS_SSL_PROTO_TLS1_2:MBEDTLS_SSL_SESSION_TICKETS:MBEDTLS_SSL_CLI_C:MBEDTLS_SSL_SRV_C:MBEDTLS_SSL_HANDSHAKE_WITH_CERT_ENABLED:PSA_HAVE_ALG_SOME_RSA_SIGN:PSA_WANT_ECC_SECP_R1_384:PSA_WANT_ALG_SHA_256:PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY:MBEDTLS_CAN_HANDLE_RSA_TEST_KEY
+write_new_session_ticket_mem
diff --git a/tests/suites/test_suite_ssl.function b/tests/suites/test_suite_ssl.function
index f53ebf71ce..f96b4b02c1 100644
--- a/tests/suites/test_suite_ssl.function
+++ b/tests/suites/test_suite_ssl.function
@@ -22,6 +22,36 @@
 #define TEST_EARLY_DATA_NO_INITIAL_ALPN 6
 #define TEST_EARLY_DATA_NO_LATER_ALPN 7
 
+#if defined(MBEDTLS_SSL_PROTO_TLS1_2) && \
+    defined(MBEDTLS_SSL_SESSION_TICKETS) && \
+    defined(MBEDTLS_SSL_CLI_C) && defined(MBEDTLS_SSL_SRV_C) && \
+    defined(MBEDTLS_SSL_HANDSHAKE_WITH_CERT_ENABLED) && \
+    defined(PSA_HAVE_ALG_SOME_RSA_SIGN) && \
+    defined(PSA_WANT_ECC_SECP_R1_384) && \
+    defined(PSA_WANT_ALG_SHA_256) && \
+    defined(PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY) && \
+    defined(MBEDTLS_CAN_HANDLE_RSA_TEST_KEY)
+static int failing_ticket_write_unset_lifetime(
+    void *p_ticket, const mbedtls_ssl_session *session,
+    unsigned char *start, const unsigned char *end,
+    size_t *tlen, uint32_t *lifetime)
+{
+    ((void) p_ticket);
+    ((void) session);
+    ((void) start);
+    ((void) end);
+    ((void) tlen);
+    ((void) lifetime);
+
+    return MBEDTLS_ERR_SSL_INTERNAL_ERROR;
+}
+#endif /* MBEDTLS_SSL_PROTO_TLS1_2 && MBEDTLS_SSL_SESSION_TICKETS &&
+          MBEDTLS_SSL_CLI_C && MBEDTLS_SSL_SRV_C &&
+          MBEDTLS_SSL_HANDSHAKE_WITH_CERT_ENABLED &&
+          PSA_HAVE_ALG_SOME_RSA_SIGN && PSA_WANT_ECC_SECP_R1_384 &&
+          PSA_WANT_ALG_SHA_256 && PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY &&
+          MBEDTLS_CAN_HANDLE_RSA_TEST_KEY */
+
 #if (!defined(MBEDTLS_SSL_PROTO_TLS1_2)) && \
     defined(MBEDTLS_SSL_EARLY_DATA) && defined(MBEDTLS_SSL_CLI_C) && \
     defined(MBEDTLS_SSL_SRV_C) && defined(MBEDTLS_DEBUG_C) && \
@@ -6523,3 +6553,64 @@ exit:
     PSA_DONE();
 }
 /* END_CASE */
+
+/* BEGIN_CASE depends_on:MBEDTLS_SSL_PROTO_TLS1_2:MBEDTLS_SSL_SESSION_TICKETS:MBEDTLS_SSL_CLI_C:MBEDTLS_SSL_SRV_C:MBEDTLS_SSL_HANDSHAKE_WITH_CERT_ENABLED:PSA_HAVE_ALG_SOME_RSA_SIGN:PSA_WANT_ECC_SECP_R1_384:PSA_WANT_ALG_SHA_256:PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY:MBEDTLS_CAN_HANDLE_RSA_TEST_KEY */
+void write_new_session_ticket_mem()
+{
+    enum { BUFFSIZE = 1024 };
+    mbedtls_test_ssl_endpoint server_ep, client_ep;
+    mbedtls_test_handshake_test_options options;
+    int ret = -1;
+
+    memset(&server_ep, 0, sizeof(server_ep));
+    memset(&client_ep, 0, sizeof(client_ep));
+    mbedtls_test_init_handshake_options(&options);
+
+    options.pk_alg = MBEDTLS_PK_RSA;
+    options.client_min_version = MBEDTLS_SSL_VERSION_TLS1_2;
+    options.client_max_version = MBEDTLS_SSL_VERSION_TLS1_2;
+    options.server_min_version = MBEDTLS_SSL_VERSION_TLS1_2;
+    options.server_max_version = MBEDTLS_SSL_VERSION_TLS1_2;
+
+    MD_OR_USE_PSA_INIT();
+
+    ret = mbedtls_test_ssl_endpoint_init(&server_ep, MBEDTLS_SSL_IS_SERVER,
+                                         &options);
+    TEST_EQUAL(ret, 0);
+
+    mbedtls_ssl_conf_session_tickets_cb(&server_ep.conf,
+                                        failing_ticket_write_unset_lifetime,
+                                        mbedtls_test_ticket_parse,
+                                        NULL);
+
+    ret = mbedtls_test_ssl_endpoint_init(&client_ep, MBEDTLS_SSL_IS_CLIENT,
+                                         &options);
+    TEST_EQUAL(ret, 0);
+
+    ret = mbedtls_test_mock_socket_connect(&(server_ep.socket),
+                                           &(client_ep.socket),
+                                           BUFFSIZE);
+    TEST_EQUAL(ret, 0);
+
+    ret = mbedtls_test_move_handshake_to_state(&(server_ep.ssl),
+                                               &(client_ep.ssl),
+                                               MBEDTLS_SSL_SERVER_CHANGE_CIPHER_SPEC);
+    TEST_EQUAL(ret, 0);
+
+    ret = mbedtls_ssl_handshake_step(&(server_ep.ssl));
+    TEST_EQUAL(ret, 0);
+
+#if defined(MBEDTLS_TEST_HAVE_MSAN)
+    {
+        volatile unsigned char lifetime_byte = server_ep.ssl.out_msg[4];
+        TEST_ASSERT(lifetime_byte != 0xff);
+    }
+#endif
+
+exit:
+    mbedtls_test_ssl_endpoint_free(&client_ep, NULL);
+    mbedtls_test_ssl_endpoint_free(&server_ep, NULL);
+    mbedtls_test_free_handshake_options(&options);
+    MD_OR_USE_PSA_DONE();
+}
+/* END_CASE */