From 06163f2bbbcd129426ff83336b11197b9a9b0a11 Mon Sep 17 00:00:00 2001 From: Jacob Barthelmeh Date: Tue, 27 Feb 2018 12:21:11 -0700 Subject: [PATCH] reduce impact of NO_OLD_SHA256_NAMES macro --- wolfssl/openssl/sha.h | 3 --- wolfssl/wolfcrypt/sha256.h | 4 +++- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/wolfssl/openssl/sha.h b/wolfssl/openssl/sha.h index 51bf656b6..86e657bcb 100644 --- a/wolfssl/openssl/sha.h +++ b/wolfssl/openssl/sha.h @@ -123,9 +123,6 @@ typedef WOLFSSL_SHA256_CTX SHA256_CTX; /* SHA256 is only available in non-fips mode because of SHA256 enum in FIPS * build. */ #define SHA256 wolfSSL_SHA256 - #define SHA256_BLOCK_SIZE WC_SHA256_BLOCK_SIZE - #define SHA256_DIGEST_SIZE WC_SHA256_DIGEST_SIZE - #define SHA256_PAD_SIZE WC_SHA256_PAD_SIZE #endif diff --git a/wolfssl/wolfcrypt/sha256.h b/wolfssl/wolfcrypt/sha256.h index e726493ea..821ca6375 100644 --- a/wolfssl/wolfcrypt/sha256.h +++ b/wolfssl/wolfcrypt/sha256.h @@ -78,8 +78,10 @@ #endif #ifndef NO_OLD_SHA256_NAMES - #define Sha256 wc_Sha256 #define SHA256 WC_SHA256 +#endif +#ifndef NO_OLD_WC_NAMES + #define Sha256 wc_Sha256 #define SHA256_BLOCK_SIZE WC_SHA256_BLOCK_SIZE #define SHA256_DIGEST_SIZE WC_SHA256_DIGEST_SIZE #define SHA256_PAD_SIZE WC_SHA256_PAD_SIZE