Merge pull request #178 from bdraco/avoid_loading_ecdsa

blag · web-flow · commit 5cbebe0254d6 · 2020-07-29T15:15:18.000-07:00
Avoid loading python-ecdsa when using the cryptography backend
diff --git a/jose/backends/cryptography_backend.py b/jose/backends/cryptography_backend.py
@@ -4,11 +4,6 @@
 
 import six
 
-try:
-    from ecdsa import SigningKey as EcdsaSigningKey, VerifyingKey as EcdsaVerifyingKey
-except ImportError:
-    EcdsaSigningKey = EcdsaVerifyingKey = None
-
 from jose.backends.base import Key
 from jose.utils import base64_to_long, long_to_base64
 from jose.constants import ALGORITHMS
@@ -46,7 +41,7 @@ def __init__(self, key, algorithm, cryptography_backend=default_backend):
             self.prepared_key = key
             return
 
-        if None not in (EcdsaSigningKey, EcdsaVerifyingKey) and isinstance(key, (EcdsaSigningKey, EcdsaVerifyingKey)):
+        if hasattr(key, 'to_pem'):
             # convert to PEM and let cryptography below load it as PEM
             key = key.to_pem().decode('utf-8')
 
diff --git a/requirements.txt b/requirements.txt
@@ -1,5 +1,5 @@
 pycryptodome
 six
 rsa
-ecdsa
+ecdsa<0.15
 pyasn1
diff --git a/setup.py b/setup.py
@@ -38,7 +38,7 @@ def _cryptography_version():
     'pycrypto': ['pycrypto >=2.6.0, <2.7.0'] + pyasn1,
     'pycryptodome': ['pycryptodome >=3.3.1, <4.0.0'] + pyasn1,
 }
-legacy_backend_requires = ['ecdsa <1.0', 'rsa'] + pyasn1
+legacy_backend_requires = ['ecdsa <0.15', 'rsa'] + pyasn1
 install_requires = ['six <2.0']
 
 # TODO: work this into the extras selection instead.
diff --git a/tox.ini b/tox.ini
@@ -21,6 +21,8 @@ deps =
     pytest
     pytest-cov
     pytest-runner
+    -r{toxinidir}/requirements.txt
+
 commands_pre =
     # Remove the python-rsa and python-ecdsa backends
     only: pip uninstall -y ecdsa rsa

-Original file line number
+Diff line change
@@ @@ -1,5 +1,5 @@ @@
 pycryptodome
 six
 rsa
 -ecdsa
 +ecdsa<0.15
 pyasn1
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ def _cryptography_version():`
`38`	`38`	`'pycrypto': ['pycrypto >=2.6.0, <2.7.0'] + pyasn1,`
`39`	`39`	`'pycryptodome': ['pycryptodome >=3.3.1, <4.0.0'] + pyasn1,`
`40`	`40`	`}`
`41`		`-legacy_backend_requires = ['ecdsa <1.0', 'rsa'] + pyasn1`
	`41`	`+legacy_backend_requires = ['ecdsa <0.15', 'rsa'] + pyasn1`
`42`	`42`	`install_requires = ['six <2.0']`
`43`	`43`
`44`	`44`	`# TODO: work this into the extras selection instead.`