8000 bpo-33936: Don't call obsolete init methods with OpenSSL 1.1.0+ (GH-1… · python/cpython@724f1a5 · GitHub
[go: up one dir, main page]

Skip to content

Commit 724f1a5

Browse files
tiranmiss-islington
authored andcommitted
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
1 parent 336b306 commit 724f1a5

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
_hashlib no longer calls obsolete OpenSSL initialization function with
2+
OpenSSL 1.1.0+.

Modules/_hashopenssl.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1138,7 +1138,7 @@ PyInit__hashlib(void)
11381138
{
11391139
PyObject *m, *openssl_md_meth_names;
11401140

1141-
#ifndef OPENSSL_VERSION_1_1
1141+
#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
11421142
/* Load all digest algorithms and initialize cpuid */
11431143
OPENSSL_add_all_algorithms_noconf();
11441144
ERR_load_crypto_strings();

0 commit comments

Comments
 (0)
0