diff options
| author | Nick Bastin <nick.bastin@gmail.com> | 2015-12-12 18:32:59 -0800 |
|---|---|---|
| committer | Nick Bastin <nick.bastin@gmail.com> | 2015-12-12 18:32:59 -0800 |
| commit | 1ebcd1c82a24502f51a1c14e6536928c65ae5406 (patch) | |
| tree | dabc1bc988715340606cccd039c54b83e8ffd11b /tests/test_x509_ext.py | |
| parent | 06042de08fb9ff549b9c9cb7244e7f27ff57eece (diff) | |
| download | cryptography-1ebcd1c82a24502f51a1c14e6536928c65ae5406.tar.gz cryptography-1ebcd1c82a24502f51a1c14e6536928c65ae5406.tar.bz2 cryptography-1ebcd1c82a24502f51a1c14e6536928c65ae5406.zip | |
Allow any OID for access_method, validate OIDs at creation time, fix tests.
Diffstat (limited to 'tests/test_x509_ext.py')
| -rw-r--r-- | tests/test_x509_ext.py | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/tests/test_x509_ext.py b/tests/test_x509_ext.py index 8f469366..8cbce10b 100644 --- a/tests/test_x509_ext.py +++ b/tests/test_x509_ext.py @@ -603,8 +603,8 @@ class TestAuthorityKeyIdentifier(object): def test_authority_cert_serial_number_not_integer(self): dirname = x509.DirectoryName( x509.Name([ - x509.NameAttribute(x509.ObjectIdentifier('oid'), u'value1'), - x509.NameAttribute(x509.ObjectIdentifier('oid2'), u'value2'), + x509.NameAttribute(x509.ObjectIdentifier('2.999.1'), u'value1'), + x509.NameAttribute(x509.ObjectIdentifier('2.999.2'), u'value2'), ]) ) with pytest.raises(TypeError): @@ -617,8 +617,8 @@ class TestAuthorityKeyIdentifier(object): def test_authority_issuer_not_none_serial_none(self): dirname = x509.DirectoryName( x509.Name([ - x509.NameAttribute(x509.ObjectIdentifier('oid'), u'value1'), - x509.NameAttribute(x509.ObjectIdentifier('oid2'), u'value2'), + x509.NameAttribute(x509.ObjectIdentifier('2.999.1'), u'value1'), + x509.NameAttribute(x509.ObjectIdentifier('2.999.2'), u'value2'), ]) ) with pytest.raises(ValueError): @@ -1166,10 +1166,10 @@ class TestDirectoryName(object): def test_eq(self): name = x509.Name([ - x509.NameAttribute(x509.ObjectIdentifier('oid'), u'value1') + x509.NameAttribute(x509.ObjectIdentifier('2.999.1'), u'value1') ]) name2 = x509.Name([ - x509.NameAttribute(x509.ObjectIdentifier('oid'), u'value1') + x509.NameAttribute(x509.ObjectIdentifier('2.999.1'), u'value1') ]) gn = x509.DirectoryName(x509.Name([name])) gn2 = x509.DirectoryName(x509.Name([name2])) @@ -1177,10 +1177,10 @@ class TestDirectoryName(object): def test_ne(self): name = x509.Name([ - x509.NameAttribute(x509.ObjectIdentifier('oid'), u'value1') + x509.NameAttribute(x509.ObjectIdentifier('2.999.1'), u'value1') ]) name2 = x509.Name([ - x509.NameAttribute(x509.ObjectIdentifier('oid'), u'value2') + x509.NameAttribute(x509.ObjectIdentifier('2.999.2'), u'value2') ]) gn = x509.DirectoryName(x509.Name([name])) gn2 = x509.DirectoryName(x509.Name([name2])) @@ -1848,7 +1848,8 @@ class TestExtendedKeyUsageExtension(object): class TestAccessDescription(object): def test_invalid_access_method(self): - with pytest.raises(ValueError): + # access_method can be *any* valid OID + with pytest.raises(TypeError): x509.AccessDescription("notanoid", x509.DNSName(u"test")) def test_invalid_access_location(self): |