From b842b8583ee6e33bbd65da9fbc33de12997e2429 Mon Sep 17 00:00:00 2001 From: Takashi Kojo Date: Mon, 18 Feb 2019 06:48:20 +0900 Subject: [PATCH] add CMSIS RTOSv2 and imporove other default values to user_settings.h template --- IDE/MDK5-ARM/Conf/user_settings.h | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/IDE/MDK5-ARM/Conf/user_settings.h b/IDE/MDK5-ARM/Conf/user_settings.h index 546cde7e5..2c1fd6c3a 100644 --- a/IDE/MDK5-ARM/Conf/user_settings.h +++ b/IDE/MDK5-ARM/Conf/user_settings.h @@ -59,8 +59,8 @@ // <4=>PThread <5=>ThreadX<6=> ThreadX/NetX // <7=>Micrium <8=>EBSnet<9=>MQX // <10=>T-RTOS <11=>uITRON4<12=>uTKERNEL2 -// <13=>Frosted <14=>CMSIS RTOS<15=>Others -#define MDK_CONF_THREAD 14 +// <13=>Frosted <14=>CMSIS RTOS<15=>CMSIS RTOSv2<16=>Others +#define MDK_CONF_THREAD 15 #if MDK_CONF_THREAD== 0 #define SINGLE_THREADED #elif MDK_CONF_THREAD == 1 @@ -92,6 +92,8 @@ #elif MDK_CONF_THREAD == 14 #define WOLFSSL_CMSIS_RTOS #elif MDK_CONF_THREAD == 15 +#define WOLFSSL_CMSIS_RTOSv2 +#elif MDK_CONF_THREAD == 16 #define SINGLE_THREADED #endif @@ -151,13 +153,13 @@ // Hash/Crypt Algrithm // MD2 -#define MDK_CONF_MD2 1 +#define MDK_CONF_MD2 0 #if MDK_CONF_MD2 == 1 #define WOLFSSL_MD2 #endif // // MD4 -#define MDK_CONF_MD4 1 +#define MDK_CONF_MD4 0 #if MDK_CONF_MD4 == 0 #define NO_MD4 #endif @@ -237,7 +239,7 @@ // // RC4 -#define MDK_CONF_RC4 1 +#define MDK_CONF_RC4 0 #if MDK_CONF_RC4 == 0 #define NO_RC4 #endif @@ -376,7 +378,7 @@ // Hardware Crypt (See document for usage) // Hardware RNG -#define MDK_CONF_STM32F2_RNG 1 +#define MDK_CONF_STM32F2_RNG 0 #if MDK_CONF_STM32F2_RNG == 1 #define WOLFSSL_STM32_CUBEMX #define STM32_RNG @@ -394,7 +396,7 @@ #endif // // Hardware Crypt -#define MDK_CONF_STM32F2_CRYPTO 1 +#define MDK_CONF_STM32F2_CRYPTO 0 #if MDK_CONF_STM32F2_CRYPTO == 1 #define WOLFSSL_STM32_CUBEMX #define STM32_CRYPTO @@ -412,7 +414,7 @@ #endif // // Hardware Hash -#define MDK_CONF_STM32F2_HASH 1 +#define MDK_CONF_STM32F2_HASH 0 #if MDK_CONF_STM32F2_HASH == 1 #define WOLFSSL_STM32_CUBEMX #define STM32_HASH @@ -462,7 +464,7 @@ #endif // // Small Stack -#define MDK_CONF_SmallStack 0 +#define MDK_CONF_SmallStack 1 #if MDK_CONF_SmallStack == 0 #define NO_WOLFSSL_SMALL_STACK #endif @@ -476,10 +478,11 @@ // wolfSSL Configuration // TLS 1.3 -#define MDK_CONF_TLS 0 +#define MDK_CONF_TLS 1 #if MDK_CONF_TLS == 1 #define WOLFSSL_TLS13 #define HAVE_TLS_EXTENSIONS +#define HAVE_SUPPORTED_CURVES #define WC_RSA_PSS #define HAVE_HKDF #define HAVE_FFDHE_2048