Skip to content

Commit

Permalink
Fix compatibility with cryptography >= 42.0.0
Browse files Browse the repository at this point in the history
The load_der_public_key method and the load_pem_private_key method were
removed from Backend class in cryptography 42.0.0[1].

Closes #713

[1] pyca/cryptography@41daf2d
  • Loading branch information
kajinamit authored and arp102 committed Mar 29, 2024
1 parent cae5747 commit 4d3b5a5
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 9 deletions.
24 changes: 16 additions & 8 deletions kmip/services/server/crypto/engine.py
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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."
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cryptography>=1.4
cryptography>=2.5
enum-compat
requests
six>=1.11.0
Expand Down

0 comments on commit 4d3b5a5

Please sign in to comment.