diff options
| author | Christian Heimes <christian@cheimes.de> | 2013-08-25 12:12:41 (GMT) |
|---|---|---|
| committer | Christian Heimes <christian@cheimes.de> | 2013-08-25 12:12:41 (GMT) |
| commit | f869a9484a5b2bb5a92fe7bf180b3e990898cbed (patch) | |
| tree | 66ff360c7c99b56e89ede29c1b822cc7e84445fe /Lib/test/test_ssl.py | |
| parent | 59a06f5020860217dbf6b408862e0b85b1a95ccc (diff) | |
| download | cpython-f869a9484a5b2bb5a92fe7bf180b3e990898cbed.zip cpython-f869a9484a5b2bb5a92fe7bf180b3e990898cbed.tar.gz cpython-f869a9484a5b2bb5a92fe7bf180b3e990898cbed.tar.bz2 | |
Issue #18709: Fix issue with IPv6 address in subjectAltName on Mac OS X Tiger
Diffstat (limited to 'Lib/test/test_ssl.py')
| -rw-r--r-- | Lib/test/test_ssl.py | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py index 563f929..f5390f6 100644 --- a/Lib/test/test_ssl.py +++ b/Lib/test/test_ssl.py @@ -137,13 +137,21 @@ class BasicSocketTests(unittest.TestCase): (('emailAddress', 'python-dev@python.org'),)) self.assertEqual(p['subject'], subject) self.assertEqual(p['issuer'], subject) - self.assertEqual(p['subjectAltName'], - (('DNS', 'altnull.python.org\x00example.com'), - ('email', 'null@python.org\x00user@example.org'), - ('URI', 'http://null.python.org\x00http://example.org'), - ('IP Address', '192.0.2.1'), - ('IP Address', '2001:DB8:0:0:0:0:0:1\n')) - ) + if ssl._OPENSSL_API_VERSION >= (0, 9, 8): + san = (('DNS', 'altnull.python.org\x00example.com'), + ('email', 'null@python.org\x00user@example.org'), + ('URI', 'http://null.python.org\x00http://example.org'), + ('IP Address', '192.0.2.1'), + ('IP Address', '2001:DB8:0:0:0:0:0:1\n')) + else: + # OpenSSL 0.9.7 doesn't support IPv6 addresses in subjectAltName + san = (('DNS', 'altnull.python.org\x00example.com'), + ('email', 'null@python.org\x00user@example.org'), + ('URI', 'http://null.python.org\x00http://example.org'), + ('IP Address', '192.0.2.1'), + ('IP Address', '<invalid>')) + + self.assertEqual(p['subjectAltName'], san) def test_DER_to_PEM(self): with open(SVN_PYTHON_ORG_ROOT_CERT, 'r') as f: |