From: Christian Heimes Date: Sat, 22 Sep 2018 05:10:06 +0000 (+0200) Subject: [3.6] bpo-34759: Fix error handling in ssl 'unwrap()' (GH-9468) (GH-9492) X-Git-Tag: v3.6.7rc1~16 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7529754d26f5e744ae25bee56fdc1937bcf08c7e;p=thirdparty%2FPython%2Fcpython.git [3.6] bpo-34759: Fix error handling in ssl 'unwrap()' (GH-9468) (GH-9492) 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. (cherry picked from commit c0da582b227f311126e278b5553a7fa89c79b054) Co-authored-by: Nathaniel J. Smith https://bugs.python.org/issue34759 --- diff --git a/Modules/_ssl.c b/Modules/_ssl.c index 327f6ae7018b..2badf3172252 100644 --- a/Modules/_ssl.c +++ b/Modules/_ssl.c @@ -2407,9 +2407,9 @@ _ssl__SSLSocket_shutdown_impl(PySSLSocket *self) 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 */