Skip to content

Commit 2b897f3

Browse files
mswarowskyVge0rge
authored andcommitted
[nrf fromtree] modules: mbedtls: Add a mbedtls_ms_time implementation
MbedTLS 3.5.0 requires a implementation of mbedtls_ms_time giving a time in ms for TLS 1.3 Therefor adding an alternative implementation using zephyrs k_uptime_get Signed-off-by: Markus Swarowsky <[email protected]> (cherry picked from commit dc76138) Signed-off-by: Markus Swarowsky <[email protected]>
1 parent a6ef7fa commit 2b897f3

File tree

6 files changed

+13
-0
lines changed

6 files changed

+13
-0
lines changed

modules/mbedtls/configs/config-mini-tls1_1.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
/* System support */
6060
#define MBEDTLS_HAVE_ASM
6161
#define MBEDTLS_HAVE_TIME
62+
#define MBEDTLS_PLATFORM_MS_TIME_ALT
6263

6364
/* mbed TLS feature support */
6465
#define MBEDTLS_CIPHER_MODE_CBC

modules/mbedtls/configs/config-no-entropy.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@
6262
/* System support */
6363
#define MBEDTLS_HAVE_ASM
6464
#define MBEDTLS_HAVE_TIME
65+
#define MBEDTLS_PLATFORM_MS_TIME_ALT
6566

6667
/* mbed TLS feature support */
6768
#define MBEDTLS_CIPHER_MODE_CBC

modules/mbedtls/configs/config-suite-b.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@
6666
/* System support */
6767
#define MBEDTLS_HAVE_ASM
6868
#define MBEDTLS_HAVE_TIME
69+
#define MBEDTLS_PLATFORM_MS_TIME_ALT
6970

7071
/* mbed TLS feature support */
7172
#define MBEDTLS_ECP_DP_SECP256R1_ENABLED

modules/mbedtls/configs/config-tls-generic.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
#if defined(CONFIG_MBEDTLS_HAVE_TIME_DATE)
3838
#define MBEDTLS_HAVE_TIME
3939
#define MBEDTLS_HAVE_TIME_DATE
40+
#define MBEDTLS_PLATFORM_MS_TIME_ALT
4041
#endif
4142

4243
#if defined(CONFIG_MBEDTLS_TEST)

modules/mbedtls/zephyr_init.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
#include <zephyr/drivers/entropy.h>
1616
#include <zephyr/random/random.h>
1717
#include <mbedtls/entropy.h>
18+
#include <mbedtls/platform_time.h>
19+
1820

1921
#include <mbedtls/debug.h>
2022

@@ -107,3 +109,9 @@ int mbedtls_init(void)
107109
{
108110
return _mbedtls_init();
109111
}
112+
113+
/* TLS 1.3 ticket lifetime needs a timing interface */
114+
mbedtls_ms_time_t mbedtls_ms_time(void)
115+
{
116+
return (mbedtls_ms_time_t)k_uptime_get();
117+
}

tests/subsys/jwt/src/tls_config/user-tls-conf.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@
33
#define MBEDTLS_HAVE_TIME
44
#define MBEDTLS_HAVE_TIME_DATE
55
#define MBEDTLS_PLATFORM_TIME_ALT
6+
#define MBEDTLS_PLATFORM_MS_TIME_ALT

0 commit comments

Comments
 (0)