From 3ef4c595064efc876bd344813fe8793aa16004c6 Mon Sep 17 00:00:00 2001 From: aidatorajiro Date: Sun, 9 Jun 2024 00:41:25 +0900 Subject: [PATCH 1/2] Fix 0x0 access of myTime function in RPi-Pico --- RPi-Pico/src/bench_main.c | 11 ++++++++--- RPi-Pico/src/test_main.c | 11 ++++++++--- RPi-Pico/src/tlsClient_main.c | 11 ++++++++--- 3 files changed, 24 insertions(+), 9 deletions(-) diff --git a/RPi-Pico/src/bench_main.c b/RPi-Pico/src/bench_main.c index eed0d33b9..1878d08ba 100644 --- a/RPi-Pico/src/bench_main.c +++ b/RPi-Pico/src/bench_main.c @@ -47,6 +47,11 @@ int main(int argc, char **argv) #include time_t myTime(time_t *t) { - *t = (((2023 - 1970) * 12 + 8) * 30 * 24 * 60 * 60); - return *t; -} \ No newline at end of file + time_t t_ret = (((2023 - 1970) * 365 + (8 * 30)) * 24 * 60 * 60); + + if (t != NULL) { + *t = t_ret; + } + + return t_ret; +} diff --git a/RPi-Pico/src/test_main.c b/RPi-Pico/src/test_main.c index 8c224a6a2..79574a6f9 100644 --- a/RPi-Pico/src/test_main.c +++ b/RPi-Pico/src/test_main.c @@ -48,6 +48,11 @@ int main(int argc, char **argv) #include time_t myTime(time_t *t) { - *t = (((2023 - 1970) * 12 + 8) * 30 * 24 * 60 * 60); - return *t; -} \ No newline at end of file + time_t t_ret = (((2023 - 1970) * 365 + (8 * 30)) * 24 * 60 * 60); + + if (t != NULL) { + *t = t_ret; + } + + return t_ret; +} diff --git a/RPi-Pico/src/tlsClient_main.c b/RPi-Pico/src/tlsClient_main.c index 7b384ea4d..6ed583bcd 100644 --- a/RPi-Pico/src/tlsClient_main.c +++ b/RPi-Pico/src/tlsClient_main.c @@ -190,6 +190,11 @@ void lwip_example_app_platform_assert(const char *msg, int line, const char *fil #include time_t myTime(time_t *t) { - *t = (((2023 - 1970) * 365 + (8 * 30)) * 24 * 60 * 60); - return *t; -} \ No newline at end of file + time_t t_ret = (((2023 - 1970) * 365 + (8 * 30)) * 24 * 60 * 60); + + if (t != NULL) { + *t = t_ret; + } + + return t_ret; +} From a02303c4e533dad329e5262136de0368ecacb354 Mon Sep 17 00:00:00 2001 From: aidatorajiro Date: Sun, 9 Jun 2024 00:51:04 +0900 Subject: [PATCH 2/2] Fix broken build in RPi-Pico --- RPi-Pico/config/user_settings.h | 3 +++ RPi-Pico/src/{wifi_main.c => Wifi_main.c} | 0 2 files changed, 3 insertions(+) rename RPi-Pico/src/{wifi_main.c => Wifi_main.c} (100%) diff --git a/RPi-Pico/config/user_settings.h b/RPi-Pico/config/user_settings.h index 3bec06248..1a2bb4d51 100644 --- a/RPi-Pico/config/user_settings.h +++ b/RPi-Pico/config/user_settings.h @@ -27,12 +27,15 @@ #ifndef WOLFSSL_USER_SETTINGS_H #define WOLFSSL_USER_SETTINGS_H +#define WOLFSSL_AUTOSAR + #ifdef __cplusplus extern "C" { #endif #include +#include #define TARGET_EMBEDDED extern time_t myTime(time_t *); diff --git a/RPi-Pico/src/wifi_main.c b/RPi-Pico/src/Wifi_main.c similarity index 100% rename from RPi-Pico/src/wifi_main.c rename to RPi-Pico/src/Wifi_main.c