diff options
author | Benjamin Peterson <benjamin@python.org> | 2015-03-05 03:50:25 (GMT) |
---|---|---|
committer | Benjamin Peterson <benjamin@python.org> | 2015-03-05 03:50:25 (GMT) |
commit | de8eca46385842a2d5c75ee5a9a8c596735f9c68 (patch) | |
tree | b22236bed104ef1b6c4d4e4604d533fb3bb64bb6 /Lib | |
parent | b64ae7bf2dcc010e6f0414d365e1ee4caba58ef0 (diff) | |
parent | 990fcaac3c428569697f62a80fd95ab4d4b93151 (diff) | |
download | cpython-de8eca46385842a2d5c75ee5a9a8c596735f9c68.zip cpython-de8eca46385842a2d5c75ee5a9a8c596735f9c68.tar.gz cpython-de8eca46385842a2d5c75ee5a9a8c596735f9c68.tar.bz2 |
merge 3.4
Diffstat (limited to 'Lib')
-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 ce427b4..596652a 100644 --- a/Lib/test/test_ssl.py +++ b/Lib/test/test_ssl.py @@ -818,8 +818,9 @@ class ContextTests(unittest.TestCase): "verify_flags need OpenSSL > 0.9.8") def test_verify_flags(self): ctx = ssl.SSLContext(ssl.PROTOCOL_TLSv1) - # default value by OpenSSL - self.assertEqual(ctx.verify_flags, ssl.VERIFY_DEFAULT) + # default value + tf = getattr(ssl, "VERIFY_X509_TRUSTED_FIRST", 0) + self.assertEqual(ctx.verify_flags, ssl.VERIFY_DEFAULT | tf) ctx.verify_flags = ssl.VERIFY_CRL_CHECK_LEAF self.assertEqual(ctx.verify_flags, ssl.VERIFY_CRL_CHECK_LEAF) ctx.verify_flags = ssl.VERIFY_CRL_CHECK_CHAIN |