diff options
| author | Christian Heimes <christian@python.org> | 2019-06-03 20:40:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-03 20:40:15 +0200 |
| commit | e35d1ba9eab07a59b98b700c5e18ceb13b2561a6 (patch) | |
| tree | 0da0371df248afc4d45c4976c6213f44e000eda5 /Lib/ssl.py | |
| parent | 06651ee418b5e4e013195d6b702763a1220706a7 (diff) | |
| download | cpython-git-e35d1ba9eab07a59b98b700c5e18ceb13b2561a6.tar.gz | |
bpo-34271: Fix compatibility with 1.0.2 (GH-13728)
Fix various compatibility issues with LibreSSL and OpenSSL 1.0.2
introduced by bpo-34271.
Signed-off-by: Christian Heimes <christian@python.org>
Diffstat (limited to 'Lib/ssl.py')
| -rw-r--r-- | Lib/ssl.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Lib/ssl.py b/Lib/ssl.py index 4afa46e5da..61bd775f75 100644 --- a/Lib/ssl.py +++ b/Lib/ssl.py @@ -658,12 +658,12 @@ class SSLContext(_SSLContext): def inner(conn, direction, version, content_type, msg_type, data): try: version = TLSVersion(version) - except TypeError: + except ValueError: pass try: content_type = _TLSContentType(content_type) - except TypeError: + except ValueError: pass if content_type == _TLSContentType.HEADER: @@ -674,7 +674,7 @@ class SSLContext(_SSLContext): msg_enum = _TLSMessageType try: msg_type = msg_enum(msg_type) - except TypeError: + except ValueError: pass return callback(conn, direction, version, |