diff options
| author | Benjamin Peterson <benjamin@python.org> | 2015-03-05 04:20:23 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2015-03-05 04:20:23 (GMT) |
| commit | 3e2500d6db07b7b0e0a8ee7adb684d3f147e52b5 (patch) | |
| tree | 7ed3155843aca44c727ae3105735108326af1718 /Lib/test/test_ssl.py | |
| parent | de8eca46385842a2d5c75ee5a9a8c596735f9c68 (diff) | |
| parent | 7bcf9a558817a4fce48b81cd9696aff9b961d978 (diff) | |
| download | cpython-3e2500d6db07b7b0e0a8ee7adb684d3f147e52b5.zip cpython-3e2500d6db07b7b0e0a8ee7adb684d3f147e52b5.tar.gz cpython-3e2500d6db07b7b0e0a8ee7adb684d3f147e52b5.tar.bz2 | |
merge 3.4
Diffstat (limited to 'Lib/test/test_ssl.py')
| -rw-r--r-- | Lib/test/test_ssl.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py index 596652a..ea619fd 100644 --- a/Lib/test/test_ssl.py +++ b/Lib/test/test_ssl.py @@ -2284,7 +2284,8 @@ else: context = ssl.SSLContext(ssl.PROTOCOL_TLSv1) context.verify_mode = ssl.CERT_REQUIRED context.load_verify_locations(SIGNING_CA) - self.assertEqual(context.verify_flags, ssl.VERIFY_DEFAULT) + tf = getattr(ssl, "VERIFY_X509_TRUSTED_FIRST", 0) + self.assertEqual(context.verify_flags, ssl.VERIFY_DEFAULT | tf) # VERIFY_DEFAULT should pass server = ThreadedEchoServer(context=server_context, chatty=True) |