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 08:39:11 +0100
commit5e80fcc5765b920dce51b03dda5f090b02cd3ebb (patch)
treee7bca30c8d46d7eb37bc761b30604f2fb11f2709 /tests/hazmat/backends/test_openssl.py
parentb72f0f192146221b0613831e828694fb769834b2 (diff)
downloadcryptography-5e80fcc5765b920dce51b03dda5f090b02cd3ebb.tar.gz
cryptography-5e80fcc5765b920dce51b03dda5f090b02cd3ebb.tar.bz2
cryptography-5e80fcc5765b920dce51b03dda5f090b02cd3ebb.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