Correctly check for cryptodev hash support

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

CLA: trivial

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6673)

diff --git a/crypto/engine/eng_devcrypto.c b/crypto/engine/eng_devcrypto.c
index 235e84b4dc19963520be7724d4a624c968bd2e8d..27c6df4f9bdd91ba7b0256620fe1001f94343255 100644 (file)
--- a/crypto/engine/eng_devcrypto.c
+++ b/crypto/engine/eng_devcrypto.c
@@ -361,20 +361,20 @@ static const struct digest_data_st {
 #endif
     { NID_sha1, 20, CRYPTO_SHA1 },
 #ifndef OPENSSL_NO_RMD160
 #endif
     { NID_sha1, 20, CRYPTO_SHA1 },
 #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 },
 # endif
 #endif
     { NID_ripemd160, 20, CRYPTO_RIPEMD160 },
 # 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 },
 #endif
     { NID_sha224, 224 / 8, CRYPTO_SHA2_224 },
 #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 },
 #endif
     { NID_sha256, 256 / 8, CRYPTO_SHA2_256 },
 #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 },
 #endif
     { NID_sha384, 384 / 8, CRYPTO_SHA2_384 },
 #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 },
 #endif
 };
     { NID_sha512, 512 / 8, CRYPTO_SHA2_512 },
 #endif
 };