From 4fa35e8b1ebb2a8e88ba7c4c9cd2a17b35638ee6 Mon Sep 17 00:00:00 2001 From: Dimitri John Ledkov Date: Fri, 28 Sep 2018 16:34:16 +0100 Subject: [PATCH] bpo-34834: Fix test_ssl.test_options to account for OP_ENABLE_MIDDLEBOX_COMPAT. Signed-off-by: Dimitri John Ledkov https://bugs.python.org/issue34834 --- Lib/test/test_ssl.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) --- a/Lib/test/test_ssl.py +++ b/Lib/test/test_ssl.py @@ -838,8 +838,12 @@ class ContextTests(unittest.TestCase): default = (ssl.OP_ALL | ssl.OP_NO_SSLv2 | ssl.OP_NO_SSLv3) # SSLContext also enables these by default default |= (OP_NO_COMPRESSION | OP_CIPHER_SERVER_PREFERENCE | - OP_SINGLE_DH_USE | OP_SINGLE_ECDH_USE | - OP_ENABLE_MIDDLEBOX_COMPAT) + ssl.OP_SINGLE_DH_USE | ssl.OP_SINGLE_ECDH_USE) + if not IS_LIBRESSL and ssl.OPENSSL_VERSION_INFO >= (1, 1, 1): + # define MIDDLEBOX constant, as python2.7 does not know about it + # but it is used by default. + OP_ENABLE_MIDDLEBOX_COMPAT = 1048576L + default |= OP_ENABLE_MIDDLEBOX_COMPAT self.assertEqual(default, ctx.options) ctx.options |= ssl.OP_NO_TLSv1 self.assertEqual(default | ssl.OP_NO_TLSv1, ctx.options)