diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2010-04-21 19:41:28 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2010-04-21 19:41:28 (GMT) |
| commit | 878602a2844640d4ec6ac53036d85fefed21243b (patch) | |
| tree | 9f4f195a6b554aa64f555d335887ade04b32dd1c /Modules/_ssl.c | |
| parent | 55b40f4c1f7efbf3d8562fc8a7240cbd135835a5 (diff) | |
| download | cpython-878602a2844640d4ec6ac53036d85fefed21243b.zip cpython-878602a2844640d4ec6ac53036d85fefed21243b.tar.gz cpython-878602a2844640d4ec6ac53036d85fefed21243b.tar.bz2 | |
Merged revisions 80314-80315 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r80314 | antoine.pitrou | 2010-04-21 21:28:03 +0200 (mer., 21 avril 2010) | 5 lines
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".
........
r80315 | antoine.pitrou | 2010-04-21 21:36:23 +0200 (mer., 21 avril 2010) | 3 lines
Forgot to add the sample certificate (followup to r80314)
........
Diffstat (limited to 'Modules/_ssl.c')
| -rw-r--r-- | Modules/_ssl.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Modules/_ssl.c b/Modules/_ssl.c index fd3b33a..73e0c79 100644 --- a/Modules/_ssl.c +++ b/Modules/_ssl.c @@ -1581,13 +1581,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", |