提交 5d58e8f1 编写于 作者: C Conrad Meyer 提交者: Rich Salz

Correctly check for cryptodev hash support

The sense of the check for build-time support for most hashes was inverted.

CLA: trivial
Reviewed-by: NRichard Levitte <levitte@openssl.org>
Reviewed-by: NPaul Dale <paul.dale@oracle.com>
Reviewed-by: NRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6673)
上级 45197ad3
...@@ -361,20 +361,20 @@ static const struct digest_data_st { ...@@ -361,20 +361,20 @@ static const struct digest_data_st {
#endif #endif
{ NID_sha1, 20, CRYPTO_SHA1 }, { NID_sha1, 20, CRYPTO_SHA1 },
#ifndef OPENSSL_NO_RMD160 #ifndef OPENSSL_NO_RMD160
# if !defined(CHECK_BSD_STYLE_MACROS) && defined(CRYPTO_RIPEMD160) # if !defined(CHECK_BSD_STYLE_MACROS) || defined(CRYPTO_RIPEMD160)
{ NID_ripemd160, 20, CRYPTO_RIPEMD160 }, { NID_ripemd160, 20, CRYPTO_RIPEMD160 },
# endif # endif
#endif #endif
#if !defined(CHECK_BSD_STYLE_MACROS) && defined(CRYPTO_SHA2_224) #if !defined(CHECK_BSD_STYLE_MACROS) || defined(CRYPTO_SHA2_224)
{ NID_sha224, 224 / 8, CRYPTO_SHA2_224 }, { NID_sha224, 224 / 8, CRYPTO_SHA2_224 },
#endif #endif
#if !defined(CHECK_BSD_STYLE_MACROS) && defined(CRYPTO_SHA2_256) #if !defined(CHECK_BSD_STYLE_MACROS) || defined(CRYPTO_SHA2_256)
{ NID_sha256, 256 / 8, CRYPTO_SHA2_256 }, { NID_sha256, 256 / 8, CRYPTO_SHA2_256 },
#endif #endif
#if !defined(CHECK_BSD_STYLE_MACROS) && defined(CRYPTO_SHA2_384) #if !defined(CHECK_BSD_STYLE_MACROS) || defined(CRYPTO_SHA2_384)
{ NID_sha384, 384 / 8, CRYPTO_SHA2_384 }, { NID_sha384, 384 / 8, CRYPTO_SHA2_384 },
#endif #endif
#if !defined(CHECK_BSD_STYLE_MACROS) && defined(CRYPTO_SHA2_512) #if !defined(CHECK_BSD_STYLE_MACROS) || defined(CRYPTO_SHA2_512)
{ NID_sha512, 512 / 8, CRYPTO_SHA2_512 }, { NID_sha512, 512 / 8, CRYPTO_SHA2_512 },
#endif #endif
}; };
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册