diff options
| author | Benjamin Peterson <benjamin@python.org> | 2014-03-12 23:10:57 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2014-03-12 23:10:57 (GMT) |
| commit | 10b93cc29cc98409ac45a94a44331b0bf6bfd666 (patch) | |
| tree | 672786bb81a6fe0363c6aec11c155cd1bd0ae17e /Lib/test/test_ssl.py | |
| parent | c4c7b1ccb6231bcd53c5a122d7a3ccf2fbbaf194 (diff) | |
| download | cpython-10b93cc29cc98409ac45a94a44331b0bf6bfd666.zip cpython-10b93cc29cc98409ac45a94a44331b0bf6bfd666.tar.gz cpython-10b93cc29cc98409ac45a94a44331b0bf6bfd666.tar.bz2 | |
merge 3.3 (#20896)
Diffstat (limited to 'Lib/test/test_ssl.py')
| -rw-r--r-- | Lib/test/test_ssl.py | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py index 0dc04c0..1a2a9f0 100644 --- a/Lib/test/test_ssl.py +++ b/Lib/test/test_ssl.py @@ -1351,12 +1351,15 @@ class NetworkedTests(unittest.TestCase): def test_get_server_certificate(self): def _test_get_server_certificate(host, port, cert=None): with support.transient_internet(host): - pem = ssl.get_server_certificate((host, port)) + pem = ssl.get_server_certificate((host, port), + ssl.PROTOCOL_SSLv23) if not pem: self.fail("No server certificate on %s:%s!" % (host, port)) try: - pem = ssl.get_server_certificate((host, port), ca_certs=CERTFILE) + pem = ssl.get_server_certificate((host, port), + ssl.PROTOCOL_SSLv23, + ca_certs=CERTFILE) except ssl.SSLError as x: #should fail if support.verbose: @@ -1364,7 +1367,9 @@ class NetworkedTests(unittest.TestCase): else: self.fail("Got server certificate %s for %s:%s!" % (pem, host, port)) - pem = ssl.get_server_certificate((host, port), ca_certs=cert) + pem = ssl.get_server_certificate((host, port), + ssl.PROTOCOL_SSLv23, + ca_certs=cert) if not pem: self.fail("No server certificate on %s:%s!" % (host, port)) if support.verbose: |