The branch master has been updated via 5d58e8f1710fbcf955bc949734aa8d594523276d (commit) from 45197ad33ee77f3773eaefe2395072fbdd9d978c (commit)
- Log ----------------------------------------------------------------- commit 5d58e8f1710fbcf955bc949734aa8d594523276d Author: Conrad Meyer <c...@freebsd.org> Date: Mon Jul 9 12:45:28 2018 -0400 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 <levi...@openssl.org> Reviewed-by: Paul Dale <paul.d...@oracle.com> Reviewed-by: Rich Salz <rs...@openssl.org> (Merged from https://github.com/openssl/openssl/pull/6673) ----------------------------------------------------------------------- Summary of changes: crypto/engine/eng_devcrypto.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/crypto/engine/eng_devcrypto.c b/crypto/engine/eng_devcrypto.c index 235e84b..27c6df4 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 }; _____ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits