diff options
| author | Christian Heimes <christian@python.org> | 2017-08-15 08:45:40 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-15 08:45:40 (GMT) |
| commit | 7f6a13bd562ff6a265fc63a991327feaecb07a77 (patch) | |
| tree | 054d79458abe802cfbf5c2576eb44c8445f352d4 /Lib/test | |
| parent | a31459008c5b3230363d155a2e8616664dc4f0c6 (diff) | |
| download | cpython-7f6a13bd562ff6a265fc63a991327feaecb07a77.zip cpython-7f6a13bd562ff6a265fc63a991327feaecb07a77.tar.gz cpython-7f6a13bd562ff6a265fc63a991327feaecb07a77.tar.bz2 | |
[3.6] bpo-30714: ALPN changes for OpenSSL 1.1.0f (#3093)
OpenSSL 1.1.0 to 1.1.0e aborted the handshake when server and client
could not agree on a protocol using ALPN. OpenSSL 1.1.0f changed that.
The most recent version now behaves like OpenSSL 1.0.2 again. The ALPN
callback can pretend to not been set.
See https://github.com/openssl/openssl/pull/3158 for more details
Signed-off-by: Christian Heimes <christian@python.org>
(cherry picked from commit a5c1bab352671e043645163ca50c5211aa657acd)
Diffstat (limited to 'Lib/test')
| -rw-r--r-- | Lib/test/test_ssl.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py index 85c59a6..3fdbba1 100644 --- a/Lib/test/test_ssl.py +++ b/Lib/test/test_ssl.py @@ -3258,8 +3258,9 @@ if _have_threads: except ssl.SSLError as e: stats = e - if expected is None and IS_OPENSSL_1_1: - # OpenSSL 1.1.0 raises handshake error + if (expected is None and IS_OPENSSL_1_1 + and ssl.OPENSSL_VERSION_INFO < (1, 1, 0, 6)): + # OpenSSL 1.1.0 to 1.1.0e raises handshake error self.assertIsInstance(stats, ssl.SSLError) else: msg = "failed trying %s (s) and %s (c).\n" \ |