mirror of
https://github.com/ARMmbed/mbedtls.git
synced 2025-10-23 00:58:55 +08:00
Merge pull request #10423 from bjwtaylor/time_t
Replace cases of time_t with mbedtls_time_t
This commit is contained in:
4
ChangeLog.d/replace_time_t.txt
Normal file
4
ChangeLog.d/replace_time_t.txt
Normal file
@@ -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.
|
@@ -3178,7 +3178,7 @@ static int ssl_tls12_session_load(mbedtls_ssl_session *session,
|
|||||||
start = MBEDTLS_GET_UINT64_BE(p, 0);
|
start = MBEDTLS_GET_UINT64_BE(p, 0);
|
||||||
p += 8;
|
p += 8;
|
||||||
|
|
||||||
session->start = (time_t) start;
|
session->start = (mbedtls_time_t) start;
|
||||||
#endif /* MBEDTLS_HAVE_TIME */
|
#endif /* MBEDTLS_HAVE_TIME */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@@ -25,7 +25,6 @@
|
|||||||
#if defined(MBEDTLS_HAVE_TIME)
|
#if defined(MBEDTLS_HAVE_TIME)
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
#define mbedtls_time time
|
#define mbedtls_time time
|
||||||
#define mbedtls_time_t time_t
|
|
||||||
#endif
|
#endif
|
||||||
#define mbedtls_printf printf
|
#define mbedtls_printf printf
|
||||||
#define mbedtls_calloc calloc
|
#define mbedtls_calloc calloc
|
||||||
|
Reference in New Issue
Block a user