From d10f0911a4a22fc48d4722a5428d359d4beddac5 Mon Sep 17 00:00:00 2001 From: Takashi Kojo Date: Sun, 20 May 2018 08:51:43 +0900 Subject: [PATCH] sHA384, SHA512 conflict with openSSL --- wolfssl/wolfcrypt/sha512.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/wolfssl/wolfcrypt/sha512.h b/wolfssl/wolfcrypt/sha512.h index 0d961a525..c2a421f69 100644 --- a/wolfssl/wolfcrypt/sha512.h +++ b/wolfssl/wolfcrypt/sha512.h @@ -71,9 +71,11 @@ #define SHA512_NOINLINE #endif -#if !defined(NO_OLD_WC_NAMES) && !defined(OPENSSL_EXTRA) +#if !defined(NO_OLD_WC_NAMES) #define Sha512 wc_Sha512 + #if !defined(OPENSSL_EXTRA) #define SHA512 WC_SHA512 + #endif #define SHA512_BLOCK_SIZE WC_SHA512_BLOCK_SIZE #define SHA512_DIGEST_SIZE WC_SHA512_DIGEST_SIZE #define SHA512_PAD_SIZE WC_SHA512_PAD_SIZE @@ -123,9 +125,11 @@ WOLFSSL_API int wc_Sha512Copy(wc_Sha512* src, wc_Sha512* dst); #ifndef HAVE_FIPS /* avoid redefinition of structs */ -#if !defined(NO_OLD_SHA_NAMES) && !defined(OPENSSL_EXTRA) +#if !defined(NO_OLD_SHA_NAMES) #define Sha384 wc_Sha384 + #if !defined(OPENSSL_EXTRA) #define SHA384 WC_SHA384 + #endif #define SHA384_BLOCK_SIZE WC_SHA384_BLOCK_SIZE #define SHA384_DIGEST_SIZE WC_SHA384_DIGEST_SIZE #define SHA384_PAD_SIZE WC_SHA384_PAD_SIZE