From 9470f67a3086e4c003ab27ca6a2209dae9b1a9e6 Mon Sep 17 00:00:00 2001 From: Marko Kreen Date: Mon, 25 May 2020 21:17:25 +0300 Subject: Cleanup serialize (#5149) * Additional tests for public/private_bytes They expose few places that raise TypeError and AssertionError! before, and ValueError later. * Cleanup of private_bytes() backend Also pass key itself down to backend. * Cleanup of public_bytes() backend * Test handling of unsupported key type --- src/cryptography/hazmat/backends/openssl/ed448.py | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) (limited to 'src/cryptography/hazmat/backends/openssl/ed448.py') diff --git a/src/cryptography/hazmat/backends/openssl/ed448.py b/src/cryptography/hazmat/backends/openssl/ed448.py index f541f05d..4845a1f2 100644 --- a/src/cryptography/hazmat/backends/openssl/ed448.py +++ b/src/cryptography/hazmat/backends/openssl/ed448.py @@ -35,15 +35,6 @@ class _Ed448PublicKey(object): return self._raw_public_bytes() - if ( - encoding in serialization._PEM_DER and - format is not serialization.PublicFormat.SubjectPublicKeyInfo - ): - raise ValueError( - "format must be SubjectPublicKeyInfo when encoding is PEM or " - "DER" - ) - return self._backend._public_key_bytes( encoding, format, self, self._evp_pkey, None ) @@ -131,16 +122,8 @@ class _Ed448PrivateKey(object): return self._raw_private_bytes() - if ( - encoding in serialization._PEM_DER and - format is not serialization.PrivateFormat.PKCS8 - ): - raise ValueError( - "format must be PKCS8 when encoding is PEM or DER" - ) - return self._backend._private_key_bytes( - encoding, format, encryption_algorithm, self._evp_pkey, None + encoding, format, encryption_algorithm, self, self._evp_pkey, None ) def _raw_private_bytes(self): -- cgit v1.2.3