commit 6ac36938b820b103ce3f41cfa20d05ff9fee9c55
author David Horstmann <david.horstmann@arm.com> Mon Sep 29 16:17:32 2025 +0000
committer GitHub <noreply@github.com> Mon Sep 29 16:17:32 2025 +0000
tree 4b0fe6e3c34e662760e9b0939a784bf3d4bd9fe3
parent 2706002c6f512f9e61cf7ce7412f4aba530cb603
parent c797a35acd88ed89eb6079903a08cf224c6f9cb9

Merge pull request #10423 from bjwtaylor/time_t

Replace cases of time_t with mbedtls_time_t

ChangeLog.d/replace_time_t.txt

diff --git a/ChangeLog.d/replace_time_t.txt b/ChangeLog.d/replace_time_t.txt
new file mode 100644
index 0000000..ec0282a
--- /dev/null
+++ b/ChangeLog.d/replace_time_t.txt
@@ -0,0 +1,4 @@
+Bugfix
+   * Fix a build error or incorrect TLS session
+     lifetime on platforms where mbedtls_time_t
+     is not time_t. Fixes #10236.

library/ssl_tls.c

diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index 37e4259..75c59a9 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -3178,7 +3178,7 @@
     start = MBEDTLS_GET_UINT64_BE(p, 0);
     p += 8;
 
-    session->start = (time_t) start;
+    session->start = (mbedtls_time_t) start;
 #endif /* MBEDTLS_HAVE_TIME */
 
     /*

programs/test/udp_proxy.c

diff --git a/programs/test/udp_proxy.c b/programs/test/udp_proxy.c
index 1c52990..efa003d 100644
--- a/programs/test/udp_proxy.c
+++ b/programs/test/udp_proxy.c
@@ -25,7 +25,6 @@
 #if defined(MBEDTLS_HAVE_TIME)
 #include <time.h>
 #define mbedtls_time            time
-#define mbedtls_time_t          time_t
 #endif
 #define mbedtls_printf          printf
 #define mbedtls_calloc          calloc