From 9c1bbbf6f324030d62b86fd297fba504ce3038e2 Mon Sep 17 00:00:00 2001 From: "Gregory P. Smith [Google LLC]" Date: Thu, 28 Mar 2024 14:42:12 -0700 Subject: [PATCH] go back to || for blake2 and shake, remove unused define. --- Modules/_hashopenssl.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Modules/_hashopenssl.c b/Modules/_hashopenssl.c index 0d4b2745c81ce7b..2d3f0e1085ba999 100644 --- a/Modules/_hashopenssl.c +++ b/Modules/_hashopenssl.c @@ -45,16 +45,13 @@ #define MUNCH_SIZE INT_MAX #define PY_OPENSSL_HAS_SCRYPT 1 -#if defined(NID_sha512_224) && defined(NID_sha512_256) -#define PY_OPENSSL_HAS_SHA512_2XX 1 -#endif #if defined(NID_sha3_224) && defined(NID_sha3_256) && defined(NID_sha3_384) && defined(NID_sha3_512) #define PY_OPENSSL_HAS_SHA3 1 #endif -#if defined(NID_shake128) && defined(NID_shake256) +#if defined(NID_shake128) || defined(NID_shake256) #define PY_OPENSSL_HAS_SHAKE 1 #endif -#if defined(NID_blake2s256) && defined(NID_blake2b512) +#if defined(NID_blake2s256) || defined(NID_blake2b512) #define PY_OPENSSL_HAS_BLAKE2 1 #endif