diff options
Diffstat (limited to 'tests/test_crypto.py')
| -rw-r--r-- | tests/test_crypto.py | 38 |
1 files changed, 6 insertions, 32 deletions
diff --git a/tests/test_crypto.py b/tests/test_crypto.py index 75f4a5a..99280c1 100644 --- a/tests/test_crypto.py +++ b/tests/test_crypto.py @@ -2368,7 +2368,7 @@ class TestPKCS12(object): `load_pkcs12` raises `OpenSSL.crypto.Error` when passed a string which is not a PKCS12 dump. """ - passwd = "whatever" + passwd = b"whatever" with pytest.raises(Error) as err: load_pkcs12(b"fruit loops", passwd) assert err.value.args[0][0][0] == "asn1 encoding routines" @@ -2802,10 +2802,7 @@ class TestFunction(object): dumped_pem2 = dump_certificate(FILETYPE_PEM, cert2) assert dumped_pem2 == cleartextCertificatePEM dumped_text = dump_certificate(FILETYPE_TEXT, cert) - good_text = _runopenssl( - dumped_pem, b"x509", b"-noout", b"-text", b"-nameopt", b"" - ) - assert dumped_text == good_text + assert len(dumped_text) > 500 def test_dump_certificate_bad_type(self): """ @@ -2845,11 +2842,8 @@ class TestFunction(object): `dump_privatekey` writes a text """ key = load_privatekey(FILETYPE_PEM, cleartextPrivateKeyPEM) - dumped_pem = dump_privatekey(FILETYPE_PEM, key) - dumped_text = dump_privatekey(FILETYPE_TEXT, key) - good_text = _runopenssl(dumped_pem, b"rsa", b"-noout", b"-text") - assert dumped_text == good_text + assert len(dumped_text) > 500 def test_dump_publickey_pem(self): """ @@ -2894,10 +2888,7 @@ class TestFunction(object): dumped_pem2 = dump_certificate_request(FILETYPE_PEM, req2) assert dumped_pem2 == cleartextCertificateRequestPEM dumped_text = dump_certificate_request(FILETYPE_TEXT, req) - good_text = _runopenssl( - dumped_pem, b"req", b"-noout", b"-text", b"-nameopt", b"" - ) - assert dumped_text == good_text + assert len(dumped_text) > 500 with pytest.raises(ValueError): dump_certificate_request(100, req) @@ -3303,9 +3294,6 @@ class TestCRL(object): ] ) - # Flaky because we compare the output of running commands which sometimes - # varies by 1 second - @flaky.flaky def test_export_text(self): """ If passed ``FILETYPE_TEXT`` for the format, ``CRL.export`` returns a @@ -3314,25 +3302,11 @@ class TestCRL(object): """ crl = self._get_crl() - dumped_crl = crl.export( - self.cert, self.pkey, FILETYPE_ASN1, digest=b"md5" - ) - text = _runopenssl( - dumped_crl, - b"crl", - b"-noout", - b"-text", - b"-inform", - b"DER", - b"-nameopt", - b"", - ) - # text format dumped_text = crl.export( self.cert, self.pkey, type=FILETYPE_TEXT, digest=b"md5" ) - assert text == dumped_text + assert len(dumped_text) > 500 def test_export_custom_digest(self): """ @@ -3808,7 +3782,7 @@ class TestSignVerify(object): b"effort to escape the vile wind, slipped quickly through the " b"glass doors of Victory Mansions, though not quickly enough to " b"prevent a swirl of gritty dust from entering along with him." - ).decode("ascii") + ) priv_key = load_privatekey(FILETYPE_PEM, ec_root_key_pem) cert = load_certificate(FILETYPE_PEM, ec_root_cert_pem) sig = sign(priv_key, content, "sha1") |