summaryrefslogtreecommitdiff
path: root/tests/test_crypto.py
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2017-06-29 18:24:17 -0500
committerAlex Gaynor <alex.gaynor@gmail.com>2017-06-29 16:24:17 -0700
commit41c1024c4664fbd81afebae22cf923b9f6352b74 (patch)
treefaec77372483d1fd67c597ed42e7bd35ac1a6664 /tests/test_crypto.py
parent10d30832462b4c44a4479dda462d4f35194a04a9 (diff)
downloadpyopenssl-git-41c1024c4664fbd81afebae22cf923b9f6352b74.tar.gz
add to_cryptography/from_cryptography on CRL and X509Req (#645)
* add to_cryptography/from_cryptography on CRL and X509Req * add changelog entry
Diffstat (limited to 'tests/test_crypto.py')
-rw-r--r--tests/test_crypto.py32
1 files changed, 32 insertions, 0 deletions
diff --git a/tests/test_crypto.py b/tests/test_crypto.py
index 2bcc933..4197f11 100644
--- a/tests/test_crypto.py
+++ b/tests/test_crypto.py
@@ -1420,6 +1420,24 @@ class TestX509Req(_PKeyInteractionTestsMixin):
request.sign(pkey, GOOD_DIGEST)
assert request.verify(pkey)
+ def test_convert_from_cryptography(self):
+ crypto_req = x509.load_pem_x509_csr(
+ cleartextCertificateRequestPEM, backend
+ )
+ req = X509Req.from_cryptography(crypto_req)
+ assert isinstance(req, X509Req)
+
+ def test_convert_from_cryptography_unsupported_type(self):
+ with pytest.raises(TypeError):
+ X509Req.from_cryptography(object())
+
+ def test_convert_to_cryptography_key(self):
+ req = load_certificate_request(
+ FILETYPE_PEM, cleartextCertificateRequestPEM
+ )
+ crypto_req = req.to_cryptography()
+ assert isinstance(crypto_req, x509.CertificateSigningRequest)
+
class TestX509(_PKeyInteractionTestsMixin):
"""
@@ -3437,6 +3455,20 @@ class TestCRL(object):
assert err.value.args[0][2] == 'unable to get certificate CRL'
assert err.value.certificate.get_subject().CN == 'intermediate-service'
+ def test_convert_from_cryptography(self):
+ crypto_crl = x509.load_pem_x509_crl(crlData, backend)
+ crl = CRL.from_cryptography(crypto_crl)
+ assert isinstance(crl, CRL)
+
+ def test_convert_from_cryptography_unsupported_type(self):
+ with pytest.raises(TypeError):
+ CRL.from_cryptography(object())
+
+ def test_convert_to_cryptography_key(self):
+ crl = load_crl(FILETYPE_PEM, crlData)
+ crypto_crl = crl.to_cryptography()
+ assert isinstance(crypto_crl, x509.CertificateRevocationList)
+
class TestX509StoreContext(object):
"""