1berry/cpython
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue #9693 - msg 115273: attempt to fix ssl module failures on certain OpenSSL versions by calling ERR_clear_error() before raising IOError

Browse Source
This commit is contained in:
Giampaolo Rodolà 2010-09-01 19:28:49 +00:00
parent fce7fd6426
commit e0f9863a61
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Modules/_ssl.c
View File

@ -1603,6 +1603,7 @@ load_cert_chain(PySSLContext *self, PyObject *args, PyObject *kwds)
PySSL_END_ALLOW_THREADS PySSL_END_ALLOW_THREADS
if (r != 1) { if (r != 1) {
if (errno != 0) { if (errno != 0) {
ERR_clear_error();
PyErr_SetFromErrno(PyExc_IOError); PyErr_SetFromErrno(PyExc_IOError);
} }
else { else {
@ -1619,6 +1620,7 @@ load_cert_chain(PySSLContext *self, PyObject *args, PyObject *kwds)
Py_XDECREF(certfile_bytes); Py_XDECREF(certfile_bytes);
if (r != 1) { if (r != 1) {
if (errno != 0) { if (errno != 0) {
ERR_clear_error();
PyErr_SetFromErrno(PyExc_IOError); PyErr_SetFromErrno(PyExc_IOError);
} }
else { else {
@ -1686,6 +1688,7 @@ load_verify_locations(PySSLContext *self, PyObject *args, PyObject *kwds)
Py_XDECREF(capath_bytes); Py_XDECREF(capath_bytes);
if (r != 1) { if (r != 1) {
if (errno != 0) { if (errno != 0) {
ERR_clear_error();
PyErr_SetFromErrno(PyExc_IOError); PyErr_SetFromErrno(PyExc_IOError);
} }
else { else {