diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-08-09 10:59:29 -0500 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-08-09 10:59:29 -0500 |
| commit | a03c325dc81b14d2a34f45f424597119999263ae (patch) | |
| tree | 9a8855ea833c416efd98130efa8e7c68bf60d107 /tests | |
| parent | 69b64e4cfa0837efebf0da313b6991369fd0bcfb (diff) | |
| download | cryptography-a03c325dc81b14d2a34f45f424597119999263ae.tar.gz cryptography-a03c325dc81b14d2a34f45f424597119999263ae.tar.bz2 cryptography-a03c325dc81b14d2a34f45f424597119999263ae.zip | |
move a test
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/hazmat/backends/test_openssl.py | 26 | ||||
| -rw-r--r-- | tests/test_x509.py | 23 |
2 files changed, 23 insertions, 26 deletions
diff --git a/tests/hazmat/backends/test_openssl.py b/tests/hazmat/backends/test_openssl.py index 1c7a718f..73aaa968 100644 --- a/tests/hazmat/backends/test_openssl.py +++ b/tests/hazmat/backends/test_openssl.py @@ -50,11 +50,6 @@ class TestLibreSkip(object): skip_if_libre_ssl(u"LibreSSL 2.1.6") -@utils.register_interface(x509.ExtensionType) -class DummyExtension(object): - oid = x509.ObjectIdentifier("1.2.3.4") - - @utils.register_interface(Mode) class DummyMode(object): name = "dummy-mode" @@ -519,27 +514,6 @@ class TestOpenSSLSignX509Certificate(object): with pytest.raises(TypeError): backend.create_x509_certificate(object(), private_key, DummyHash()) - def test_checks_for_unsupported_extensions(self): - private_key = RSA_KEY_2048.private_key(backend) - builder = x509.CertificateBuilder().subject_name(x509.Name([ - x509.NameAttribute(x509.OID_COUNTRY_NAME, u'US'), - ])).issuer_name(x509.Name([ - x509.NameAttribute(x509.OID_COUNTRY_NAME, u'US'), - ])).public_key( - private_key.public_key() - ).serial_number( - 777 - ).not_valid_before( - datetime.datetime(1999, 1, 1) - ).not_valid_after( - datetime.datetime(2020, 1, 1) - ).add_extension( - DummyExtension(), False - ) - - with pytest.raises(NotImplementedError): - builder.sign(private_key, hashes.SHA1(), backend) - class TestOpenSSLSerialisationWithOpenSSL(object): def test_pem_password_cb_buffer_too_small(self): diff --git a/tests/test_x509.py b/tests/test_x509.py index 9100b442..ce52ffac 100644 --- a/tests/test_x509.py +++ b/tests/test_x509.py @@ -835,6 +835,29 @@ class TestRSACertificateRequest(object): class TestCertificateBuilder(object): @pytest.mark.requires_backend_interface(interface=RSABackend) @pytest.mark.requires_backend_interface(interface=X509Backend) + def test_checks_for_unsupported_extensions(self, backend): + private_key = RSA_KEY_2048.private_key(backend) + builder = x509.CertificateBuilder().subject_name(x509.Name([ + x509.NameAttribute(x509.OID_COUNTRY_NAME, u'US'), + ])).issuer_name(x509.Name([ + x509.NameAttribute(x509.OID_COUNTRY_NAME, u'US'), + ])).public_key( + private_key.public_key() + ).serial_number( + 777 + ).not_valid_before( + datetime.datetime(1999, 1, 1) + ).not_valid_after( + datetime.datetime(2020, 1, 1) + ).add_extension( + DummyExtension(), False + ) + + with pytest.raises(NotImplementedError): + builder.sign(private_key, hashes.SHA1(), backend) + + @pytest.mark.requires_backend_interface(interface=RSABackend) + @pytest.mark.requires_backend_interface(interface=X509Backend) def test_no_subject_name(self, backend): subject_private_key = RSA_KEY_2048.private_key(backend) builder = x509.CertificateBuilder().serial_number( |