summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2010-04-21 19:28:03 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2010-04-21 19:28:03 (GMT)
commitc715a9ed08f5b4ed05effd10adf25cc79551eb02 (patch)
tree129483b0867595fef6ed0b4c9e40c1dcb85e7a1c /Modules
parent62e17ad2340f2c46aed45cf38ead786f5d5124d2 (diff)
downloadcpython-c715a9ed08f5b4ed05effd10adf25cc79551eb02.zip
cpython-c715a9ed08f5b4ed05effd10adf25cc79551eb02.tar.gz
cpython-c715a9ed08f5b4ed05effd10adf25cc79551eb02.tar.bz2
Issue #8484: Load all ciphers and digest algorithms when initializing
the _ssl extension, such that verification of some SSL certificates doesn't fail because of an "unknown algorithm".
Diffstat (limited to 'Modules')
-rw-r--r--Modules/_ssl.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/Modules/_ssl.c b/Modules/_ssl.c
index 6dad6a6..4702ecb 100644
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -1603,13 +1603,14 @@ init_ssl(void)
/* Init OpenSSL */
SSL_load_error_strings();
+ SSL_library_init();
#ifdef WITH_THREAD
/* note that this will start threading if not already started */
if (!_setup_ssl_threads()) {
return;
}
#endif
- SSLeay_add_ssl_algorithms();
+ OpenSSL_add_all_algorithms();
/* Add symbols to module dict */
PySSLErrorObject = PyErr_NewException("ssl.SSLError",