[Python-checkins] [3.6] bpo-34759: Fix error handling in ssl 'unwrap()' (GH-9468) (GH-9492)

Sat Sep 22 01:10:10 EDT 2018

https://github.com/python/cpython/commit/7529754d26f5e744ae25bee56fdc1937bcf08c7e
commit: 7529754d26f5e744ae25bee56fdc1937bcf08c7e
branch: 3.6
author: Christian Heimes <christian at python.org>
committer: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
date: 2018年09月21日T22:10:06-07:00
summary:
[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 <njs at pobox.com>
https://bugs.python.org/issue34759
files:
M Modules/_ssl.c

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 */
