mirror of https://github.com/OpenKMIP/PyKMIP.git
Fix compatibility with cryptography >= 42.0.0
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] 41daf2d86d
This commit is contained in:
parent
cae5747a19
commit
4d3b5a52ae
|
@ -584,13 +584,17 @@ class CryptographyEngine(api.CryptographicEngine):
|
|||
"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 @@ class CryptographyEngine(api.CryptographicEngine):
|
|||
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 @@ class CryptographyEngine(api.CryptographicEngine):
|
|||
)
|
||||
|
||||
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."
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
cryptography>=1.4
|
||||
cryptography>=2.5
|
||||
enum-compat
|
||||
requests
|
||||
six>=1.11.0
|
||||
|
|
Loading…
Reference in New Issue