diff options
author | Antoine Pitrou <solipsis@pitrou.net> | 2011-04-03 16:16:50 (GMT) |
---|---|---|
committer | Antoine Pitrou <solipsis@pitrou.net> | 2011-04-03 16:16:50 (GMT) |
commit | a7caec74aabed6842e5ea608df431a35987195c0 (patch) | |
tree | cf2ac5e7254177e0a61ed078a2504f64052a1f90 /Modules/_ssl.c | |
parent | 24ce3863873d976ba28299ad7bd880f612e049af (diff) | |
parent | 9c25486093a28c345896dcd13a84d8cd5f535763 (diff) | |
download | cpython-a7caec74aabed6842e5ea608df431a35987195c0.zip cpython-a7caec74aabed6842e5ea608df431a35987195c0.tar.gz cpython-a7caec74aabed6842e5ea608df431a35987195c0.tar.bz2 |
Merge fix for issue #11746
Diffstat (limited to 'Modules/_ssl.c')
-rw-r--r-- | Modules/_ssl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/_ssl.c b/Modules/_ssl.c index d077895..0ae02a1 100644 --- a/Modules/_ssl.c +++ b/Modules/_ssl.c @@ -1620,7 +1620,7 @@ load_cert_chain(PySSLContext *self, PyObject *args, PyObject *kwds) goto error; } PySSL_BEGIN_ALLOW_THREADS - r = SSL_CTX_use_RSAPrivateKey_file(self->ctx, + r = SSL_CTX_use_PrivateKey_file(self->ctx, PyBytes_AS_STRING(keyfile ? keyfile_bytes : certfile_bytes), SSL_FILETYPE_PEM); PySSL_END_ALLOW_THREADS |