From 12d2d17d1817e0169658f6ca64bb652f2bd43fb0 Mon Sep 17 00:00:00 2001 From: David Garske Date: Mon, 18 Nov 2019 08:48:24 -0800 Subject: [PATCH] Minor cleanups to TLS bench tool configuration. --- IDE/OPENSTM32/.cproject | 149 ++++++++++++++++++++++++++++ IDE/OPENSTM32/Inc/user_settings.h | 22 ++-- IDE/OPENSTM32/Src/wolfssl_example.c | 4 +- 3 files changed, 164 insertions(+), 11 deletions(-) diff --git a/IDE/OPENSTM32/.cproject b/IDE/OPENSTM32/.cproject index 294abb34a..7b2bae139 100644 --- a/IDE/OPENSTM32/.cproject +++ b/IDE/OPENSTM32/.cproject @@ -150,6 +150,155 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/IDE/OPENSTM32/Inc/user_settings.h b/IDE/OPENSTM32/Inc/user_settings.h index a66bf708e..1b0252df5 100644 --- a/IDE/OPENSTM32/Inc/user_settings.h +++ b/IDE/OPENSTM32/Inc/user_settings.h @@ -89,10 +89,10 @@ extern "C" { #define WOLFSSL_SP #define WOLFSSL_SP_SMALL /* use smaller version of code */ #define WOLFSSL_HAVE_SP_RSA - #define WOLFSSL_HAVE_SP_DH + //#define WOLFSSL_HAVE_SP_DH #define WOLFSSL_HAVE_SP_ECC #define WOLFSSL_SP_CACHE_RESISTANT - //#define WOLFSSL_SP_MATH /* only SP math - eliminates fast math code */ + #define WOLFSSL_SP_MATH /* only SP math - eliminates fast math code */ //#define WOLFSSL_SP_ASM /* required if using the ASM versions */ //#define WOLFSSL_SP_ARM_CORTEX_M_ASM @@ -197,8 +197,8 @@ extern "C" { #define HAVE_AESGCM /* GCM Method: GCM_SMALL, GCM_WORD32 or GCM_TABLE */ - #undef GCM_TABLE - #define GCM_TABLE + #undef GCM_SMALL + #define GCM_SMALL #undef WOLFSSL_AES_COUNTER #define WOLFSSL_AES_COUNTER @@ -261,7 +261,11 @@ extern "C" { /* Sha256 */ #undef NO_SHA256 #if 1 - #if 1 + /* not unrolled - ~2k smaller and ~25% slower */ + //#define USE_SLOW_SHA256 + + /* Sha224 */ + #if 0 #define WOLFSSL_SHA224 #endif #else @@ -271,6 +275,9 @@ extern "C" { /* Sha512 */ #undef WOLFSSL_SHA512 #if 1 + /* over twice as small, but 50% slower */ + //#define USE_SLOW_SHA512 + #define WOLFSSL_SHA512 #define HAVE_SHA512 /* freeRTOS settings.h requires this */ @@ -279,9 +286,6 @@ extern "C" { #if 1 #define WOLFSSL_SHA384 #endif - - /* over twice as small, but 50% slower */ - //#define USE_SLOW_SHA2 #endif /* MD5 */ @@ -326,7 +330,7 @@ extern "C" { #endif #else #undef NO_WOLFSSL_MEMORY - #define NO_WOLFSSL_MEMORY + //#define NO_WOLFSSL_MEMORY #undef NO_ERROR_STRINGS //#define NO_ERROR_STRINGS diff --git a/IDE/OPENSTM32/Src/wolfssl_example.c b/IDE/OPENSTM32/Src/wolfssl_example.c index 91f8fac83..a6e3708a9 100644 --- a/IDE/OPENSTM32/Src/wolfssl_example.c +++ b/IDE/OPENSTM32/Src/wolfssl_example.c @@ -52,8 +52,8 @@ #define WOLFSSL_CIPHER_LIST_MAX_SIZE 2048 #endif #if 0 - /* define this to test only one cipher suite */ - #define TEST_CIPHER_SUITE "ECDHE-RSA-AES256-GCM-SHA384" + /* define this to test only a specific cipher suite(s) (colon separated) */ + #define TEST_CIPHER_SUITE "ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256" #endif