mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-30 04:15:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

[3.6] bpo-30102: Call OPENSSL_add_all_algorithms_noconf (GH-3112) (#3342)

Browse source 
The ssl and hashlib modules now call OPENSSL_add_all_algorithms_noconf() on
OpenSSL < 1.1.0. The function detects CPU features and enables optimizations
on some CPU architectures such as POWER8. Patch is based on research from
Gustavo Serra Scalet.

Signed-off-by: Christian Heimes <christian@python.org>
(cherry picked from commit c941e62)
This commit is contained in:
Christian Heimes 2017-09-05 17:12:03 +02:00 • committed by GitHub
parent 02854dab62
commit 2ddea0f098
3 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Misc/NEWS.d/next/Library/2017-08-16-21-14-31.bpo-30102.1sPqmc.rst Normal file
View file

@ -0,0 +1,4 @@
The ssl and hashlib modules now call OPENSSL_add_all_algorithms_noconf() on
OpenSSL < 1.1.0. The function detects CPU features and enables optimizations
on some CPU architectures such as POWER8. Patch is based on research from
Gustavo Serra Scalet.

5
Modules/_hashopenssl.c
View file

@ -1022,8 +1022,11 @@ PyInit__hashlib(void)
{ {
PyObject *m, *openssl_md_meth_names; PyObject *m, *openssl_md_meth_names;
OpenSSL_add_all_digests(); #ifndef OPENSSL_VERSION_1_1
/* Load all digest algorithms and initialize cpuid */
OPENSSL_add_all_algorithms_noconf();
ERR_load_crypto_strings(); ERR_load_crypto_strings();
#endif
/* TODO build EVP_functions openssl_* entries dynamically based /* TODO build EVP_functions openssl_* entries dynamically based
* on what hashes are supported rather than listing many * on what hashes are supported rather than listing many

6
Modules/_ssl.c
View file

@ -5171,9 +5171,14 @@ PyInit__ssl(void)
return NULL; return NULL;
PySocketModule = *socket_api; PySocketModule = *socket_api;
#ifndef OPENSSL_VERSION_1_1
/* Load all algorithms and initialize cpuid */
OPENSSL_add_all_algorithms_noconf();
/* Init OpenSSL */ /* Init OpenSSL */
SSL_load_error_strings(); SSL_load_error_strings();
SSL_library_init(); SSL_library_init();
#endif
#ifdef WITH_THREAD #ifdef WITH_THREAD
#ifdef HAVE_OPENSSL_CRYPTO_LOCK #ifdef HAVE_OPENSSL_CRYPTO_LOCK
/* note that this will start threading if not already started */ /* note that this will start threading if not already started */
@ -5185,7 +5190,6 @@ PyInit__ssl(void)
_ssl_locks_count++; _ssl_locks_count++;
#endif #endif
#endif /* WITH_THREAD */ #endif /* WITH_THREAD */
OpenSSL_add_all_algorithms();
/* Add symbols to module dict */ /* Add symbols to module dict */
sslerror_type_slots[0].pfunc = PyExc_OSError; sslerror_type_slots[0].pfunc = PyExc_OSError;