diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2019-09-16 19:48:21 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-16 19:48:21 (GMT) |
| commit | 5d55d52b61f56522e616ac1423437d4e3f641ce6 (patch) | |
| tree | 4a660075ae54f683d76fcafca87a375dff427b7a /Modules | |
| parent | d8903416d223d01e23dfa8bffe48b1428d90d202 (diff) | |
| download | cpython-5d55d52b61f56522e616ac1423437d4e3f641ce6.zip cpython-5d55d52b61f56522e616ac1423437d4e3f641ce6.tar.gz cpython-5d55d52b61f56522e616ac1423437d4e3f641ce6.tar.bz2 | |
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@python.org>
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/_hashopenssl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/_hashopenssl.c b/Modules/_hashopenssl.c index 78445eb..5df08e5 100644 --- a/Modules/_hashopenssl.c +++ b/Modules/_hashopenssl.c @@ -901,7 +901,7 @@ init_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(); |