aboutsummaryrefslogtreecommitdiffstats
path: root/tests/test_x509_ext.py
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2015-07-05 10:19:07 -0400
committerAlex Gaynor <alex.gaynor@gmail.com>2015-07-05 10:19:07 -0400
commit0784a23d4ab15e98214ccdf07021d42568404c1c (patch)
tree7fcb8b8eafc3c6bf144e86cfae548b863aa38f6b /tests/test_x509_ext.py
parentabfb699573bc4b7e95589b6044142a4f889dd421 (diff)
parent7bdf657f5971bb29567edbbbf044a65014a59d94 (diff)
downloadcryptography-0784a23d4ab15e98214ccdf07021d42568404c1c.tar.gz
cryptography-0784a23d4ab15e98214ccdf07021d42568404c1c.tar.bz2
cryptography-0784a23d4ab15e98214ccdf07021d42568404c1c.zip
Merge pull request #2114 from reaperhulk/san-unsupported-name
change unsupported generalname test to use x400address
Diffstat (limited to 'tests/test_x509_ext.py')
-rw-r--r--tests/test_x509_ext.py10
1 files changed, 4 insertions, 6 deletions
diff --git a/tests/test_x509_ext.py b/tests/test_x509_ext.py
index 0ef84e79..d15d6669 100644
--- a/tests/test_x509_ext.py
+++ b/tests/test_x509_ext.py
@@ -1382,18 +1382,16 @@ class TestRSASubjectAlternativeNameExtension(object):
dns = ext.value.get_values_for_type(x509.DNSName)
assert dns == [u'*.\u043f\u044b\u043a\u0430.cryptography']
- def test_unsupported_other_name(self, backend):
+ def test_unsupported_gn(self, backend):
cert = _load_cert(
- os.path.join(
- "x509", "custom", "san_other_name.pem"
- ),
- x509.load_pem_x509_certificate,
+ os.path.join("x509", "san_x400address.der"),
+ x509.load_der_x509_certificate,
backend
)
with pytest.raises(x509.UnsupportedGeneralNameType) as exc:
cert.extensions
- assert exc.value.type == 0
+ assert exc.value.type == 3
def test_registered_id(self, backend):
cert = _load_cert(