summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Kanakarakis <ivan.kanak@gmail.com>2022-04-18 22:17:12 +0300
committerIvan Kanakarakis <ivan.kanak@gmail.com>2022-04-18 22:17:12 +0300
commit9d1e8a485cd4f744bf942e6e6b18a25db0138fac (patch)
tree939b307387d3d6fcc10d1166af1c9bafc80cae0e
parentf36b06aa2a8aeb41394139d0fa2cf20b59f41dd9 (diff)
downloadpysaml2-9d1e8a485cd4f744bf942e6e6b18a25db0138fac.tar.gz
Remove deprecated cryptography backend param
Signed-off-by: Ivan Kanakarakis <ivan.kanak@gmail.com>
-rw-r--r--setup.cfg2
-rw-r--r--src/saml2/cryptography/asymmetric.py4
-rw-r--r--src/saml2/cryptography/pki.py3
-rw-r--r--src/saml2/cryptography/symmetric.py6
4 files changed, 4 insertions, 11 deletions
diff --git a/setup.cfg b/setup.cfg
index 024030ee..4d47ee35 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -48,7 +48,7 @@ scripts =
tools/parse_xsd2.py
python_requires = >=3.6, <4
install_requires =
- cryptography >= 1.4
+ cryptography >= 3.1
defusedxml
pyOpenSSL
python-dateutil
diff --git a/src/saml2/cryptography/asymmetric.py b/src/saml2/cryptography/asymmetric.py
index 8cff93af..92dbfbb8 100644
--- a/src/saml2/cryptography/asymmetric.py
+++ b/src/saml2/cryptography/asymmetric.py
@@ -1,6 +1,5 @@
"""This module provides methods for asymmetric cryptography."""
-import cryptography.hazmat.backends as _backends
import cryptography.hazmat.primitives.asymmetric as _asymmetric
import cryptography.hazmat.primitives.hashes as _hashes
import cryptography.hazmat.primitives.serialization as _serialization
@@ -8,8 +7,7 @@ import cryptography.hazmat.primitives.serialization as _serialization
def load_pem_private_key(data, password):
"""Load RSA PEM certificate."""
- key = _serialization.load_pem_private_key(
- data, password, _backends.default_backend())
+ key = _serialization.load_pem_private_key(data, password)
return key
diff --git a/src/saml2/cryptography/pki.py b/src/saml2/cryptography/pki.py
index 8c59fdaf..f385e03d 100644
--- a/src/saml2/cryptography/pki.py
+++ b/src/saml2/cryptography/pki.py
@@ -1,9 +1,8 @@
"""This module provides methods for PKI operations."""
-import cryptography.hazmat.backends as _backends
import cryptography.x509 as _x509
def load_pem_x509_certificate(data):
"""Load X.509 PEM certificate."""
- return _x509.load_pem_x509_certificate(data, _backends.default_backend())
+ return _x509.load_pem_x509_certificate(data)
diff --git a/src/saml2/cryptography/symmetric.py b/src/saml2/cryptography/symmetric.py
index ff73641e..ce0e19ee 100644
--- a/src/saml2/cryptography/symmetric.py
+++ b/src/saml2/cryptography/symmetric.py
@@ -10,7 +10,6 @@ import logging
from warnings import warn as _warn
import cryptography.fernet as _fernet
-import cryptography.hazmat.backends as _backends
import cryptography.hazmat.primitives.ciphers as _ciphers
from .errors import SymmetricCryptographyError
@@ -158,10 +157,7 @@ class AESCipher(object):
except KeyError:
raise Exception('Unsupported chaining mode: {}'.format(cmode))
- cipher = _ciphers.Cipher(
- _ciphers.algorithms.AES(self.key),
- mode(iv),
- backend=_backends.default_backend())
+ cipher = _ciphers.Cipher(_ciphers.algorithms.AES(self.key), mode(iv))
return cipher, iv