diff options
author | Mark Adams <mark@markadams.me> | 2016-12-17 13:37:07 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-12-17 13:37:07 -0600 |
commit | 0a4b8ddcb3ee95fd1e91539f5976854bb42ab375 (patch) | |
tree | ba35d1417d2f27c526118eda0f63390a7cb49c92 | |
parent | 7dd3d4a16ca270d6de8db077b7c61abc0f4d2f0d (diff) | |
parent | aaf2ac3e0cb6f9180f1357526e37e94d22ce0dec (diff) | |
download | pyjwt-0a4b8ddcb3ee95fd1e91539f5976854bb42ab375.tar.gz |
Merge pull request #235 from bluetech/replace-cryptography-deprecated
Require cryptography >= 1.0, replace deprecated functions
-rw-r--r-- | jwt/utils.py | 6 | ||||
-rwxr-xr-x | setup.py | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/jwt/utils.py b/jwt/utils.py index 4f0a496..b33c7a2 100644 --- a/jwt/utils.py +++ b/jwt/utils.py @@ -6,7 +6,7 @@ from .compat import binary_type, bytes_from_int, text_type try: from cryptography.hazmat.primitives.asymmetric.utils import ( - decode_rfc6979_signature, encode_rfc6979_signature + decode_dss_signature, encode_dss_signature ) except ImportError: pass @@ -95,7 +95,7 @@ def der_to_raw_signature(der_sig, curve): num_bits = curve.key_size num_bytes = (num_bits + 7) // 8 - r, s = decode_rfc6979_signature(der_sig) + r, s = decode_dss_signature(der_sig) return number_to_bytes(r, num_bytes) + number_to_bytes(s, num_bytes) @@ -110,4 +110,4 @@ def raw_to_der_signature(raw_sig, curve): r = bytes_to_number(raw_sig[:num_bytes]) s = bytes_to_number(raw_sig[num_bytes:]) - return encode_rfc6979_signature(r, s) + return encode_dss_signature(r, s) @@ -69,7 +69,7 @@ setup( tests_require=tests_require, extras_require=dict( test=tests_require, - crypto=['cryptography'], + crypto=['cryptography >= 1.0'], flake8=[ 'flake8', 'flake8-import-order', |