From 15486ae3795a53d934408e27ec025c3425aed5d8 Mon Sep 17 00:00:00 2001 From: kaleb-himes Date: Wed, 31 Jan 2018 15:09:16 -0700 Subject: [PATCH 1/2] windows configuration changes --- wolfssl/wolfcrypt/settings.h | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/wolfssl/wolfcrypt/settings.h b/wolfssl/wolfcrypt/settings.h index 6e9001291..dd6c83461 100644 --- a/wolfssl/wolfcrypt/settings.h +++ b/wolfssl/wolfcrypt/settings.h @@ -1234,11 +1234,21 @@ extern void uITRON4_free(void *p) ; #ifdef WOLFSSL_SGX #ifdef _MSC_VER - #define WOLFCRYPT_ONLY #define NO_RC4 - #define NO_DES3 - #define NO_SHA - #define NO_MD5 + #if !defined(HAVE_FIPS) && !defined(WOLFSSL_SGX) + #define WOLFCRYPT_ONLY + #define NO_DES3 + #define NO_SHA + #define NO_MD5 + #else + #define TFM_TIMING_RESISTANT + #define NO_WOLFSSL_DIR + #define NO_FILESYSTEM + #define NO_WRITEV + #define NO_MAIN_DRIVER + #define WOLFSSL_LOG_PRINTF + #define WOLFSSL_DH_CONST + #endif #else #define HAVE_ECC #define ECC_TIMING_RESISTANT From 4803b3316e1ca7ec48626ba600924f8a4beb69e7 Mon Sep 17 00:00:00 2001 From: Kaleb Himes Date: Mon, 5 Feb 2018 13:05:24 -0700 Subject: [PATCH 2/2] Update settings.h --- wolfssl/wolfcrypt/settings.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wolfssl/wolfcrypt/settings.h b/wolfssl/wolfcrypt/settings.h index dd6c83461..2bce0f579 100644 --- a/wolfssl/wolfcrypt/settings.h +++ b/wolfssl/wolfcrypt/settings.h @@ -1235,7 +1235,7 @@ extern void uITRON4_free(void *p) ; #ifdef WOLFSSL_SGX #ifdef _MSC_VER #define NO_RC4 - #if !defined(HAVE_FIPS) && !defined(WOLFSSL_SGX) + #ifndef HAVE_FIPS #define WOLFCRYPT_ONLY #define NO_DES3 #define NO_SHA