diff --git a/kmip/services/server/crypto/engine.py b/kmip/services/server/crypto/engine.py index 3c6534a6..5b7cacaa 100644 --- a/kmip/services/server/crypto/engine.py +++ b/kmip/services/server/crypto/engine.py @@ -584,13 +584,17 @@ def _encrypt_asymmetric(self, "encryption.".format(padding_method) ) - backend = default_backend() - try: - public_key = backend.load_der_public_key(encryption_key) + public_key = serialization.load_der_public_key( + encryption_key, + backend=default_backend() + ) except Exception: try: - public_key = backend.load_pem_public_key(encryption_key) + public_key = serialization.load_pem_public_key( + encryption_key, + backend=default_backend() + ) except Exception: raise exceptions.CryptographicFailure( "The public key bytes could not be loaded." @@ -1433,8 +1437,6 @@ def verify_signature(self, loaded, or when the signature verification process fails unexpectedly. """ - backend = default_backend() - hash_algorithm = None dsa_hash_algorithm = None dsa_signing_algorithm = None @@ -1488,10 +1490,16 @@ def verify_signature(self, ) try: - public_key = backend.load_der_public_key(signing_key) + public_key = serialization.load_der_public_key( + signing_key, + backend=default_backend() + ) except Exception: try: - public_key = backend.load_pem_public_key(signing_key) + public_key = serialization.load_pem_public_key( + signing_key, + backend=default_backend() + ) except Exception: raise exceptions.CryptographicFailure( "The signing key bytes could not be loaded." diff --git a/requirements.txt b/requirements.txt index bee04c94..c74a7baf 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -cryptography>=1.4 +cryptography>=2.5 enum-compat requests six>=1.11.0