diff options
| author | Conrad Meyer <cem@FreeBSD.org> | 2018-07-09 12:45:28 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2018-07-09 12:45:28 -0400 |
| commit | 5d58e8f1710fbcf955bc949734aa8d594523276d (patch) | |
| tree | 7dfa97495d52b3ceaf62ed7e5b12b724ce79268f /crypto/engine | |
| parent | 45197ad33ee77f3773eaefe2395072fbdd9d978c (diff) | |
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)
Diffstat (limited to 'crypto/engine')
| -rw-r--r-- | crypto/engine/eng_devcrypto.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/crypto/engine/eng_devcrypto.c b/crypto/engine/eng_devcrypto.c index 235e84b4dc..27c6df4f9b 100644 --- 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 -# 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 -#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 -#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 -#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 -#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 }; |