diff options
| author | Benjamin Peterson <benjamin@python.org> | 2014-03-12 18:14:19 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2014-03-12 18:14:19 (GMT) |
| commit | f31213cd655953981be787a9a3609daf28f77b6b (patch) | |
| tree | cd4aebc7d8e5ed6d8e7671013cb464e3f6af608d | |
| parent | 5a2c04012c62cba18df17e084d8668f1f2ecac4c (diff) | |
| download | cpython-f31213cd655953981be787a9a3609daf28f77b6b.zip cpython-f31213cd655953981be787a9a3609daf28f77b6b.tar.gz cpython-f31213cd655953981be787a9a3609daf28f77b6b.tar.bz2 | |
Backed out changeset c13398566409
| -rw-r--r-- | Lib/test/test_ssl.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py index ad0689c..0dc04c0 100644 --- a/Lib/test/test_ssl.py +++ b/Lib/test/test_ssl.py @@ -1351,13 +1351,12 @@ class NetworkedTests(unittest.TestCase): def test_get_server_certificate(self): def _test_get_server_certificate(host, port, cert=None): with support.transient_internet(host): - # FIXME: force PROTOCOL_SSLv23 for workaround bug #20896 - pem = ssl.get_server_certificate((host, port), ssl_version=ssl.PROTOCOL_SSLv23) + pem = ssl.get_server_certificate((host, port)) if not pem: self.fail("No server certificate on %s:%s!" % (host, port)) try: - pem = ssl.get_server_certificate((host, port), ca_certs=CERTFILE, ssl_version=ssl.PROTOCOL_SSLv23) + pem = ssl.get_server_certificate((host, port), ca_certs=CERTFILE) except ssl.SSLError as x: #should fail if support.verbose: @@ -1365,7 +1364,7 @@ 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, ssl_version=ssl.PROTOCOL_SSLv23) + pem = ssl.get_server_certificate((host, port), ca_certs=cert) if not pem: self.fail("No server certificate on %s:%s!" % (host, port)) if support.verbose: |