[Python-checkins] bpo-33936: Don't call obsolete init methods with OpenSSL 1.1.0+ (GH-16140)

Mon Sep 16 15:48:07 EDT 2019

https://github.com/python/cpython/commit/1ecc75ad1cdf458c2aa7192844e83c4665a5f9b5
commit: 1ecc75ad1cdf458c2aa7192844e83c4665a5f9b5
branch: 3.8
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2019年09月16日T12:48:03-07:00
summary:
bpo-33936: Don't call obsolete init methods with OpenSSL 1.1.0+ (GH-16140)
``OPENSSL_VERSION_1_1`` was never defined in ``_hashopenssl.c``.
https://bugs.python.org/issue33936
(cherry picked from commit 724f1a57231f9287c37255adf0e4364d12cf693d)
Co-authored-by: Christian Heimes <christian at python.org>
files:
A Misc/NEWS.d/next/Library/2019-09-14-10-34-00.bpo-33936.8wCI_n.rst
M Modules/_hashopenssl.c

diff --git a/Misc/NEWS.d/next/Library/2019-09-14-10-34-00.bpo-33936.8wCI_n.rst b/Misc/NEWS.d/next/Library/2019-09-14-10-34-00.bpo-33936.8wCI_n.rst
new file mode 100644
index 000000000000..7bc7fed483a2
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2019-09-14-10-34-00.bpo-33936.8wCI_n.rst
@@ -0,0 +1,2 @@
+_hashlib no longer calls obsolete OpenSSL initialization function with
+OpenSSL 1.1.0+.
diff --git a/Modules/_hashopenssl.c b/Modules/_hashopenssl.c
index 0e29fe1d3301..84906a4da4f5 100644
--- a/Modules/_hashopenssl.c
+++ b/Modules/_hashopenssl.c
@@ -1105,7 +1105,7 @@ PyInit__hashlib(void)
 {
 PyObject *m, *openssl_md_meth_names;
 
-#ifndef OPENSSL_VERSION_1_1
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
 /* Load all digest algorithms and initialize cpuid */
 OPENSSL_add_all_algorithms_noconf();
 ERR_load_crypto_strings();
