Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 1 | From 8b06d56d26eee289fec22b9b72ab4c7cc3d6c482 Mon Sep 17 00:00:00 2001 |
| 2 | From: Dimitri John Ledkov <xnox@ubuntu.com> |
| 3 | Date: Fri, 28 Sep 2018 16:34:16 +0100 |
| 4 | Subject: [PATCH 3/4] bpo-34834: Fix test_ssl.test_options to account for |
| 5 | OP_ENABLE_MIDDLEBOX_COMPAT. |
| 6 | |
| 7 | Signed-off-by: Dimitri John Ledkov <xnox@ubuntu.com> |
| 8 | |
| 9 | https://bugs.python.org/issue34834 |
| 10 | |
| 11 | Patch taken from Ubuntu. |
| 12 | Upstream-Status: Submitted [https://github.com/python/cpython/pull/9624] |
| 13 | |
| 14 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> |
| 15 | --- |
| 16 | Lib/test/test_ssl.py | 5 +++++ |
| 17 | 1 file changed, 5 insertions(+) |
| 18 | |
| 19 | diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py |
| 20 | index 7a14053cee..efc906a5ba 100644 |
| 21 | --- a/Lib/test/test_ssl.py |
| 22 | +++ b/Lib/test/test_ssl.py |
| 23 | @@ -777,6 +777,11 @@ class ContextTests(unittest.TestCase): |
| 24 | default = (ssl.OP_ALL | ssl.OP_NO_SSLv2 | ssl.OP_NO_SSLv3) |
| 25 | if not IS_LIBRESSL and ssl.OPENSSL_VERSION_INFO >= (1, 1, 0): |
| 26 | default |= ssl.OP_NO_COMPRESSION |
| 27 | + if not IS_LIBRESSL and ssl.OPENSSL_VERSION_INFO >= (1, 1, 1): |
| 28 | + # define MIDDLEBOX constant, as python2.7 does not know about it |
| 29 | + # but it is used by default. |
| 30 | + OP_ENABLE_MIDDLEBOX_COMPAT = 1048576L |
| 31 | + default |= OP_ENABLE_MIDDLEBOX_COMPAT |
| 32 | self.assertEqual(default, ctx.options) |
| 33 | ctx.options |= ssl.OP_NO_TLSv1 |
| 34 | self.assertEqual(default | ssl.OP_NO_TLSv1, ctx.options) |
| 35 | -- |
| 36 | 2.17.1 |
| 37 | |