]> git.ipfire.org Git - thirdparty/Python/cpython.git/commit
[3.6] bpo-34759: Fix error handling in ssl 'unwrap()' (GH-9468) (GH-9492)
authorChristian Heimes <christian@python.org>
Sat, 22 Sep 2018 05:10:06 +0000 (07:10 +0200)
committerMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Sat, 22 Sep 2018 05:10:06 +0000 (22:10 -0700)
commit7529754d26f5e744ae25bee56fdc1937bcf08c7e
tree745fdec004ca42e255b128513219d7ecf4115b2c
parentd1b336e530472f316b1d164d04626724c83b16d7
[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@pobox.com>
https://bugs.python.org/issue34759
Modules/_ssl.c