From 08f1b8b1d80bfb20a2678e324cf28110b901701a Mon Sep 17 00:00:00 2001 From: Aidan Garske Date: Fri, 16 Oct 2026 10:18:02 -0700 Subject: [PATCH 1/3] Remove Frosted OS support --- IDE/MDK5-ARM/Conf/user_settings.h | 2 +- wolfcrypt/src/wc_port.c | 29 ----------------------------- wolfssl/ssl.h | 1 - wolfssl/wolfcrypt/settings.h | 4 ++++ wolfssl/wolfcrypt/wc_port.h | 4 ---- 5 files changed, 5 insertions(+), 35 deletions(-) diff --git a/IDE/MDK5-ARM/Conf/user_settings.h b/IDE/MDK5-ARM/Conf/user_settings.h index bdc3ee8f8ab..e251a75b591 100644 --- a/IDE/MDK5-ARM/Conf/user_settings.h +++ b/IDE/MDK5-ARM/Conf/user_settings.h @@ -87,7 +87,7 @@ #elif MDK_CONF_THREAD == 12 #define WOLFSSL_uTKERNEL2 #elif MDK_CONF_THREAD == 13 -#define WOLFSSL_FROSTED +#error "Frosted OS support has been removed" #elif MDK_CONF_THREAD == 14 #define WOLFSSL_CMSIS_RTOS #elif MDK_CONF_THREAD == 15 diff --git a/wolfcrypt/src/wc_port.c b/wolfcrypt/src/wc_port.c index 0e3bf981338..7d454a8ca9d 100644 --- a/wolfcrypt/src/wc_port.c +++ b/wolfcrypt/src/wc_port.c @@ -4250,35 +4250,6 @@ int wc_local_InitMutexOnce(wolfSSL_Mutex* m, wc_MutexOnceFlag* flag) } } -#elif defined (WOLFSSL_FROSTED) - - int wc_InitMutex(wolfSSL_Mutex* m) - { - *m = mutex_init(); - if (*m) - return 0; - else - return -1; - } - - int wc_FreeMutex(wolfSSL_Mutex* m) - { - mutex_destroy(*m); - return(0); - } - - int wc_LockMutex(wolfSSL_Mutex* m) - { - mutex_lock(*m); - return 0; - } - - int wc_UnLockMutex(wolfSSL_Mutex* m) - { - mutex_unlock(*m); - return 0; - } - #elif defined(WOLFSSL_CMSIS_RTOS) #ifndef CMSIS_NMUTEX diff --git a/wolfssl/ssl.h b/wolfssl/ssl.h index ad14fcf5ab4..5b14bc3a4a8 100644 --- a/wolfssl/ssl.h +++ b/wolfssl/ssl.h @@ -4041,7 +4041,6 @@ WOLFSSL_API int wolfSSL_make_eap_keys(WOLFSSL* ssl, void* key, unsigned int len, #include "services/sys/uio.h" #elif !defined(WOLFSSL_MDK_ARM) && !defined(WOLFSSL_IAR_ARM) && \ !defined(WOLFSSL_ROWLEY_ARM) && !defined(WOLFSSL_EMBOS) && \ - !defined(WOLFSSL_FROSTED) && \ !defined(WOLFSSL_CHIBIOS) && !defined(WOLFSSL_CONTIKI) && \ !defined(WOLFSSL_ZEPHYR) && !defined(NETOS) && \ !defined(WOLFSSL_NDS) diff --git a/wolfssl/wolfcrypt/settings.h b/wolfssl/wolfcrypt/settings.h index 6564f4aa52a..c05a7e6937f 100644 --- a/wolfssl/wolfcrypt/settings.h +++ b/wolfssl/wolfcrypt/settings.h @@ -391,6 +391,10 @@ #error "Apache Mynewt support has been removed" #endif +#ifdef WOLFSSL_FROSTED + #error "Frosted OS support has been removed" +#endif + #if defined(HAVE_FIPS) && \ (defined(WC_FIPS_LL_CRYPTO) || defined(WOLFSSL_FIPS_DEV_NO_POST)) && \ !defined(FIPS_NO_WRAPPERS) diff --git a/wolfssl/wolfcrypt/wc_port.h b/wolfssl/wolfcrypt/wc_port.h index 73a9da8625f..2ff3ba575da 100644 --- a/wolfssl/wolfcrypt/wc_port.h +++ b/wolfssl/wolfcrypt/wc_port.h @@ -327,8 +327,6 @@ #include #include #include -#elif defined(WOLFSSL_FROSTED) - #include #elif defined(INTIME_RTOS) #include #include @@ -513,8 +511,6 @@ typedef osMutexId_t wolfSSL_Mutex; #elif defined(WOLFSSL_TIRTOS) typedef ti_sysbios_knl_Semaphore_Handle wolfSSL_Mutex; - #elif defined(WOLFSSL_FROSTED) - typedef mutex_t * wolfSSL_Mutex; #elif defined(INTIME_RTOS) typedef RTHANDLE wolfSSL_Mutex; #elif defined(WOLFSSL_NUCLEUS_1_2) From 87493f12c7b3a6a0391c452f1bac41931ae8bd27 Mon Sep 17 00:00:00 2001 From: Aidan Garske Date: Fri, 23 Oct 2026 11:50:34 -0700 Subject: [PATCH 2/3] Recognize retired frosted macros in source checks --- .wolfssl_known_macro_extras | 1 + 1 file changed, 1 insertion(+) diff --git a/.wolfssl_known_macro_extras b/.wolfssl_known_macro_extras index 4c7d550bb03..8f3f3c4948d 100644 --- a/.wolfssl_known_macro_extras +++ b/.wolfssl_known_macro_extras @@ -1009,6 +1009,7 @@ WOLFSSL_FORCE_OCSP_NONCE_CHECK WOLFSSL_FRDM_K64 WOLFSSL_FRDM_K64_JENKINS WOLFSSL_FRODOKEM_NO_ASN1 +WOLFSSL_FROSTED WOLFSSL_FUNC_TIME WOLFSSL_FUNC_TIME_LOG WOLFSSL_GAME_BUILD From 0bdb4d22acf3e38be10f19ecc6c2e48551757ea3 Mon Sep 17 00:00:00 2001 From: Aidan Garske Date: Thu, 5 Nov 2026 10:44:09 -0800 Subject: [PATCH 3/3] Drop Frosted from the MDK thread wizard options --- IDE/MDK5-ARM/Conf/user_settings.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IDE/MDK5-ARM/Conf/user_settings.h b/IDE/MDK5-ARM/Conf/user_settings.h index e251a75b591..42b4d8cdc2d 100644 --- a/IDE/MDK5-ARM/Conf/user_settings.h +++ b/IDE/MDK5-ARM/Conf/user_settings.h @@ -58,7 +58,7 @@ // <5=>PThread <6=>ThreadX // <7=>Micrium <8=>EBSnet <9=>MQX // <10=>T-RTOS <11=>uITRON4 <12=>uTKERNEL2 -// <13=>Frosted <14=>CMSIS RTOS <15=>CMSIS RTOSv2 <16=>Others +// <14=>CMSIS RTOS <15=>CMSIS RTOSv2 <16=>Others #define MDK_CONF_THREAD 15 #if MDK_CONF_THREAD== 0 #define SINGLE_THREADED