aboutsummaryrefslogtreecommitdiffstats
path: root/tests/hazmat/backends/test_openssl.py
diff options
context:
space:
mode:
authormichael-hart <michael.hart1994@gmail.com>2014-09-26 00:32:25 +0100
committermichael-hart <michael.hart1994@gmail.com>2014-09-26 18:40:27 +0100
commit801e8c1b88b77e9feb8ad57af166c4b52b15f22a (patch)
tree0e5cabb33f221649e12de0a39fed9f2385d156d2 /tests/hazmat/backends/test_openssl.py
parentb45731b94d7a50b4b4ca39e6a571fc5c19f509b4 (diff)
downloadcryptography-801e8c1b88b77e9feb8ad57af166c4b52b15f22a.tar.gz
cryptography-801e8c1b88b77e9feb8ad57af166c4b52b15f22a.tar.bz2
cryptography-801e8c1b88b77e9feb8ad57af166c4b52b15f22a.zip
Added all changes lost in merge reset
Diffstat (limited to 'tests/hazmat/backends/test_openssl.py')
-rw-r--r--tests/hazmat/backends/test_openssl.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/hazmat/backends/test_openssl.py b/tests/hazmat/backends/test_openssl.py
index cf70f109..d4c5e2e7 100644
--- a/tests/hazmat/backends/test_openssl.py
+++ b/tests/hazmat/backends/test_openssl.py
@@ -473,6 +473,8 @@ class TestOpenSSLSerialisationWithOpenSSL(object):
key = pretend.stub(type="unsupported")
with raises_unsupported_algorithm(None):
backend._evp_pkey_to_private_key(key)
+ with raises_unsupported_algorithm(None):
+ backend._evp_pkey_to_public_key(key)
def test_very_long_pem_serialization_password(self):
password = "x" * 1024