From 73bdecb121cf56fe8e4c4aaf58a510977f81bff6 Mon Sep 17 00:00:00 2001 From: Stefan Borer Date: Tue, 9 Feb 2021 11:20:48 +0100 Subject: [PATCH 1/2] chore: fix cryptography 3.4 warning --- jose/backends/cryptography_backend.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/jose/backends/cryptography_backend.py b/jose/backends/cryptography_backend.py index 2533f2e2..d4256bd2 100644 --- a/jose/backends/cryptography_backend.py +++ b/jose/backends/cryptography_backend.py @@ -20,9 +20,14 @@ from cryptography.hazmat.primitives.keywrap import aes_key_wrap, aes_key_unwrap, InvalidUnwrap from cryptography.hazmat.primitives.padding import PKCS7 from cryptography.hazmat.primitives.serialization import load_pem_private_key, load_pem_public_key -from cryptography.utils import int_from_bytes, int_to_bytes from cryptography.x509 import load_pem_x509_certificate +if not hasattr(int, "from_bytes"): + from cryptography.utils import int_from_bytes, int_to_bytes +else: + from cryptography.utils import int_to_bytes + int_from_bytes = int.from_bytes + _binding = None From 3fe3c824d9ca16ba893a830b9103ed7992b5717f Mon Sep 17 00:00:00 2001 From: Stefan Borer Date: Wed, 10 Feb 2021 13:42:30 +0100 Subject: [PATCH 2/2] fix(deps): cryptography version pinning cryptography 3.4 was breaking change, so pin to minor version. --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 5d82817e..a51d4649 100644 --- a/setup.py +++ b/setup.py @@ -29,7 +29,7 @@ def _cryptography_version(): if platform.python_implementation() == 'PyPy' and platform.python_version() < '5.4': return 'cryptography < 2.5' - return 'cryptography' + return 'cryptography < 3.5' pyasn1 = ['pyasn1']