From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> Date: Wed, 6 Nov 2019 06:10:05 +0000 (-0800) Subject: bpo-38684: haslib: fix build when Blake2 not enabled in OpenSSL (GH-17043) X-Git-Tag: v3.8.1rc1~102 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7c20888e71304ecbf4bd3d595f364b7c691d30a0;p=thirdparty%2FPython%2Fcpython.git bpo-38684: haslib: fix build when Blake2 not enabled in OpenSSL (GH-17043) (cherry picked from commit 6552563b3d5061816720a5a6c7d4ffd6ba35b98b) Co-authored-by: Alexandru Ardelean --- diff --git a/Misc/NEWS.d/next/Build/2019-11-04-14-30-37.bpo-38684.aed593.rst b/Misc/NEWS.d/next/Build/2019-11-04-14-30-37.bpo-38684.aed593.rst new file mode 100644 index 000000000000..c715ff970412 --- /dev/null +++ b/Misc/NEWS.d/next/Build/2019-11-04-14-30-37.bpo-38684.aed593.rst @@ -0,0 +1 @@ +Fix _hashlib build when Blake2 is disabled, but OpenSSL supports it. diff --git a/Modules/_hashopenssl.c b/Modules/_hashopenssl.c index 1513e4e35edc..3e5f9c3e0df6 100644 --- a/Modules/_hashopenssl.c +++ b/Modules/_hashopenssl.c @@ -42,7 +42,7 @@ #define PY_OPENSSL_HAS_SHAKE 1 #endif -#ifdef NID_blake2b512 +#if defined(NID_blake2b512) && !defined(OPENSSL_NO_BLAKE2) #define PY_OPENSSL_HAS_BLAKE2 1 #endif