Commit 5a2c0401 authored by Victor Stinner's avatar Victor Stinner

Issue #20896: Workaround the bug temporarely to fix buildbots

parent a0fe1f74
...@@ -1351,12 +1351,13 @@ class NetworkedTests(unittest.TestCase): ...@@ -1351,12 +1351,13 @@ class NetworkedTests(unittest.TestCase):
def test_get_server_certificate(self): def test_get_server_certificate(self):
def _test_get_server_certificate(host, port, cert=None): def _test_get_server_certificate(host, port, cert=None):
with support.transient_internet(host): with support.transient_internet(host):
pem = ssl.get_server_certificate((host, port)) # FIXME: force PROTOCOL_SSLv23 for workaround bug #20896
pem = ssl.get_server_certificate((host, port), ssl_version=ssl.PROTOCOL_SSLv23)
if not pem: if not pem:
self.fail("No server certificate on %s:%s!" % (host, port)) self.fail("No server certificate on %s:%s!" % (host, port))
try: try:
pem = ssl.get_server_certificate((host, port), ca_certs=CERTFILE) pem = ssl.get_server_certificate((host, port), ca_certs=CERTFILE, ssl_version=ssl.PROTOCOL_SSLv23)
except ssl.SSLError as x: except ssl.SSLError as x:
#should fail #should fail
if support.verbose: if support.verbose:
...@@ -1364,7 +1365,7 @@ class NetworkedTests(unittest.TestCase): ...@@ -1364,7 +1365,7 @@ class NetworkedTests(unittest.TestCase):
else: else:
self.fail("Got server certificate %s for %s:%s!" % (pem, host, port)) 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), ca_certs=cert, ssl_version=ssl.PROTOCOL_SSLv23)
if not pem: if not pem:
self.fail("No server certificate on %s:%s!" % (host, port)) self.fail("No server certificate on %s:%s!" % (host, port))
if support.verbose: if support.verbose:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment