bpo-34759: Fix error handling in ssl 'unwrap()' (GH-9468)
OpenSSL follows the convention that whenever you call a function, it
returns an error indicator value; and if this value is negative, then
you need to go look at the actual error code to see what happened.
Commit c6fd1c1c3a introduced a small mistake in
_ssl__SSLSocket_shutdown_impl: instead of checking whether the error
indicator was negative, it started checking whether the actual error
code was negative, and it turns out that the error codes are never
negative. So the effect was that 'unwrap()' lost the ability to raise
SSL errors.
https://bugs.python.org/issue34759
diff --git a/Modules/_ssl.c b/Modules/_ssl.c
index 4750b93..5b5d7dd 100644
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -2583,9 +2583,9 @@
break;
}
- if (err.ssl < 0) {
+ if (ret < 0) {
Py_XDECREF(sock);
- return PySSL_SetError(self, err.ssl, __FILE__, __LINE__);
+ return PySSL_SetError(self, ret, __FILE__, __LINE__);
}
if (sock)
/* It's already INCREF'ed */