bpo-38684: haslib: fix build when Blake2 not enabled in OpenSSL (pythonGH-17043)

miss-islington · commodo · web-flow · commit 7c20888e7130 · 2019-11-05T22:10:05.000-08:00
(cherry picked from commit 6552563) Co-authored-by: Alexandru Ardelean <ardeleanalex@gmail.com>
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
@@ -0,0 +1 @@
+Fix _hashlib build when Blake2 is disabled, but OpenSSL supports it.
diff --git 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
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Fix _hashlib build when Blake2 is disabled, but OpenSSL supports it.`