diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2010-04-21 19:52:52 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2010-04-21 19:52:52 (GMT) |
| commit | da6902cb7ba83b4a5fd82fd183f248b7984d1e36 (patch) | |
| tree | c5bfaa8dd55d7baa76c18d07cb1212bf8706c51a /Modules/_ssl.c | |
| parent | 0c21bdf3c31eeb4dbcb12ad82b396eafa74bef62 (diff) | |
| download | cpython-da6902cb7ba83b4a5fd82fd183f248b7984d1e36.zip cpython-da6902cb7ba83b4a5fd82fd183f248b7984d1e36.tar.gz cpython-da6902cb7ba83b4a5fd82fd183f248b7984d1e36.tar.bz2 | |
Merged revisions 80317 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r80317 | antoine.pitrou | 2010-04-21 21:46:23 +0200 (mer., 21 avril 2010) | 15 lines
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 3cec4b4..5311f77 100644 --- a/Modules/_ssl.c +++ b/Modules/_ssl.c @@ -1652,13 +1652,14 @@ PyInit__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 NULL; } #endif - SSLeay_add_ssl_algorithms(); + OpenSSL_add_all_algorithms(); /* Add symbols to module dict */ PySSLErrorObject = PyErr_NewException("ssl.SSLError", |