forked from wolfSSL/wolfssl
Fix for Zephyr TimeNowInMilliseconds
. Resolves issue with TLS v1.3 server and session tickets time (uptime in sim < 1000 ms was being made 0).
This commit is contained in:
@@ -9768,7 +9768,12 @@ ProtocolVersion MakeDTLSv1_3(void)
|
|||||||
|
|
||||||
word32 LowResTimer(void)
|
word32 LowResTimer(void)
|
||||||
{
|
{
|
||||||
return k_uptime_get() / 1000;
|
int64_t t;
|
||||||
|
#if defined(CONFIG_ARCH_POSIX)
|
||||||
|
k_cpu_idle();
|
||||||
|
#endif
|
||||||
|
t = k_uptime_get(); /* returns current uptime in milliseconds */
|
||||||
|
return (word32)(t / 1000);
|
||||||
}
|
}
|
||||||
|
|
||||||
#elif defined(WOLFSSL_LINUXKM)
|
#elif defined(WOLFSSL_LINUXKM)
|
||||||
|
@@ -1910,10 +1910,12 @@ end:
|
|||||||
#elif defined(WOLFSSL_ZEPHYR)
|
#elif defined(WOLFSSL_ZEPHYR)
|
||||||
word32 TimeNowInMilliseconds(void)
|
word32 TimeNowInMilliseconds(void)
|
||||||
{
|
{
|
||||||
|
int64_t t;
|
||||||
#if defined(CONFIG_ARCH_POSIX)
|
#if defined(CONFIG_ARCH_POSIX)
|
||||||
k_cpu_idle();
|
k_cpu_idle();
|
||||||
#endif
|
#endif
|
||||||
return (word32)k_uptime_get() / 1000;
|
t = k_uptime_get(); /* returns current uptime in milliseconds */
|
||||||
|
return (word32)t;
|
||||||
}
|
}
|
||||||
|
|
||||||
#else
|
#else
|
||||||
@@ -2201,10 +2203,12 @@ end:
|
|||||||
#elif defined(WOLFSSL_ZEPHYR)
|
#elif defined(WOLFSSL_ZEPHYR)
|
||||||
sword64 TimeNowInMilliseconds(void)
|
sword64 TimeNowInMilliseconds(void)
|
||||||
{
|
{
|
||||||
|
int64_t t;
|
||||||
#if defined(CONFIG_ARCH_POSIX)
|
#if defined(CONFIG_ARCH_POSIX)
|
||||||
k_cpu_idle();
|
k_cpu_idle();
|
||||||
#endif
|
#endif
|
||||||
return (sword64)k_uptime_get() / 1000;
|
t = k_uptime_get(); /* returns current uptime in milliseconds */
|
||||||
|
return (sword64)t;
|
||||||
}
|
}
|
||||||
|
|
||||||
#else
|
#else
|
||||||
|
@@ -12998,13 +12998,13 @@ void bench_sphincsKeySign(byte level, byte optim)
|
|||||||
|
|
||||||
double current_time(int reset)
|
double current_time(int reset)
|
||||||
{
|
{
|
||||||
|
int64_t t;
|
||||||
(void)reset;
|
(void)reset;
|
||||||
|
|
||||||
#if defined(CONFIG_ARCH_POSIX)
|
#if defined(CONFIG_ARCH_POSIX)
|
||||||
k_cpu_idle();
|
k_cpu_idle();
|
||||||
#endif
|
#endif
|
||||||
|
t = k_uptime_get(); /* returns current uptime in milliseconds */
|
||||||
return (double)k_uptime_get() / 1000;
|
return (double)(t / 1000);
|
||||||
}
|
}
|
||||||
|
|
||||||
#elif defined(WOLFSSL_NETBURNER)
|
#elif defined(WOLFSSL_NETBURNER)
|
||||||
|
Reference in New Issue
Block a user