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

miss-islington · tiran · web-flow · commit 1ecc75ad1cdf · 2019-09-16T12:48:03.000-07:00
``OPENSSL_VERSION_1_1`` was never defined in ``_hashopenssl.c``. https://bugs.python.org/issue33936 (cherry picked from commit 724f1a5) Co-authored-by: Christian Heimes <christian@python.org>
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
@@ -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
@@ -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();

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+_hashlib no longer calls obsolete OpenSSL initialization function with`
	`2`	`+OpenSSL 1.1.0+.`
Original file line number	Diff line number	Diff line change
`@@ -1105,7 +1105,7 @@ PyInit__hashlib(void)`
`1105`	`1105`	`{`
`1106`	`1106`	`PyObject m, openssl_md_meth_names;`
`1107`	`1107`
`1108`		`-#ifndef OPENSSL_VERSION_1_1`
	`1108`	`+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) \|\| defined(LIBRESSL_VERSION_NUMBER)`
`1109`	`1109`	`/* Load all digest algorithms and initialize cpuid */`
`1110`	`1110`	`OPENSSL_add_all_algorithms_noconf();`
`1111`	`1111`	`ERR_load_crypto_strings();`