diff options
| author | Alexandru Ardelean <ardeleanalex@gmail.com> | 2019-11-04 14:55:56 (GMT) |
|---|---|---|
| committer | Christian Heimes <christian@python.org> | 2019-11-04 14:55:56 (GMT) |
| commit | 6552563b3d5061816720a5a6c7d4ffd6ba35b98b (patch) | |
| tree | 7ffc5ebe0ba1155a2c525e537b6ae866dc8e8e11 | |
| parent | 1cdadf414b9934bba9294efa1f4b8d97eef08434 (diff) | |
| download | cpython-6552563b3d5061816720a5a6c7d4ffd6ba35b98b.zip cpython-6552563b3d5061816720a5a6c7d4ffd6ba35b98b.tar.gz cpython-6552563b3d5061816720a5a6c7d4ffd6ba35b98b.tar.bz2 | |
bpo-38684: haslib: fix build when Blake2 not enabled in OpenSSL (#17043)
| -rw-r--r-- | Misc/NEWS.d/next/Build/2019-11-04-14-30-37.bpo-38684.aed593.rst | 1 | ||||
| -rw-r--r-- | Modules/_hashopenssl.c | 2 |
2 files changed, 2 insertions, 1 deletions
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 0000000..c715ff9 --- /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 b147dbe..360e444 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 |