sHA384, SHA512 conflict with openSSL

This commit is contained in:
Takashi Kojo 2018-05-20 08:51:43 +09:00
parent 874022d938
commit d10f0911a4

View File

@ -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