mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-04 08:34:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge fix for issue #11746

Browse source
This commit is contained in:
Antoine Pitrou 2011-04-03 18:16:50 +02:00
commit a7caec74aa
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Misc/NEWS
View file

@ -87,6 +87,9 @@ Core and Builtins
Library Library
------- -------
- Issue #11746: Fix SSLContext.load_cert_chain() to accept elliptic curve
private keys.
- Issue #5863: Rewrite BZ2File in pure Python, and allow it to accept - Issue #5863: Rewrite BZ2File in pure Python, and allow it to accept
file-like objects using a new ``fileobj`` constructor argument. Patch by file-like objects using a new ``fileobj`` constructor argument. Patch by
Nadeem Vawda. Nadeem Vawda.

2
Modules/_ssl.c
View file

@ -1620,7 +1620,7 @@ load_cert_chain(PySSLContext *self, PyObject *args, PyObject *kwds)
goto error; goto error;
} }
PySSL_BEGIN_ALLOW_THREADS 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), PyBytes_AS_STRING(keyfile ? keyfile_bytes : certfile_bytes),
SSL_FILETYPE_PEM); SSL_FILETYPE_PEM);
PySSL_END_ALLOW_THREADS PySSL_END_ALLOW_THREADS