From 97b3364720acdd4c928ddc336f88e0b1ea781421 Mon Sep 17 00:00:00 2001 From: Bridger Voss Date: Tue, 8 Jul 2025 16:23:29 -0600 Subject: [PATCH] FREESCALE forced algs moved to IDE/MQX/user_settings.h --- IDE/MQX/user_settings.h | 11 +++++++++++ wolfssl/wolfcrypt/settings.h | 15 --------------- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/IDE/MQX/user_settings.h b/IDE/MQX/user_settings.h index 70602fe2f..4ece14fb3 100644 --- a/IDE/MQX/user_settings.h +++ b/IDE/MQX/user_settings.h @@ -59,3 +59,14 @@ #define FREESCALE_MQX #define FREESCALE_NO_RNG +/* FREESCALE forced-on algorithms - moved from settings.h */ +#ifndef NO_AES + #undef HAVE_AESCCM + #define HAVE_AESCCM + #undef HAVE_AESGCM + #define HAVE_AESGCM + #undef WOLFSSL_AES_COUNTER + #define WOLFSSL_AES_COUNTER + #undef WOLFSSL_AES_DIRECT + #define WOLFSSL_AES_DIRECT +#endif diff --git a/wolfssl/wolfcrypt/settings.h b/wolfssl/wolfcrypt/settings.h index fb09637c5..eeb5e2dec 100644 --- a/wolfssl/wolfcrypt/settings.h +++ b/wolfssl/wolfcrypt/settings.h @@ -1901,21 +1901,6 @@ extern void uITRON4_free(void *p) ; #define TFM_TIMING_RESISTANT #define ECC_TIMING_RESISTANT - #undef HAVE_ECC - #ifndef WOLFCRYPT_FIPS_RAND - #define HAVE_ECC - #endif - #ifndef NO_AES - #undef HAVE_AESCCM - #define HAVE_AESCCM - #undef HAVE_AESGCM - #define HAVE_AESGCM - #undef WOLFSSL_AES_COUNTER - #define WOLFSSL_AES_COUNTER - #undef WOLFSSL_AES_DIRECT - #define WOLFSSL_AES_DIRECT - #endif - #ifdef FREESCALE_KSDK_1_3 #include "fsl_device_registers.h" #elif !defined(FREESCALE_MQX)