Skip to content

Denylist ecdsa 0.15 in setup.py to allow for 0.16 to be installed. #199

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
blag merged 3 commits into from
Dec 8, 2020
Merged

Denylist ecdsa 0.15 in setup.py to allow for 0.16 to be installed. #199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
368a2ad
Denylist ecdsa 0.15 in setup.py to allow for 0.16 to be installed.
dreid Nov 30, 2020
39262fa
Pass allow_truncate=False to ecdsa sign/verify
dreid Dec 7, 2020
d59ad6d
Flake8
dreid Dec 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions jose/backends/ecdsa_backend.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,11 +91,22 @@ def _process_jwk(self, jwk_dict):
return ecdsa.keys.VerifyingKey.from_public_point(point, self.curve)

def sign(self, msg):
return self.prepared_key.sign(msg, hashfunc=self.hash_alg, sigencode=ecdsa.util.sigencode_string)
return self.prepared_key.sign(
msg,
hashfunc=self.hash_alg,
sigencode=ecdsa.util.sigencode_string,
allow_truncate=False
)

def verify(self, msg, sig):
try:
return self.prepared_key.verify(sig, msg, hashfunc=self.hash_alg, sigdecode=ecdsa.util.sigdecode_string)
return self.prepared_key.verify(
sig,
msg,
hashfunc=self.hash_alg,
sigdecode=ecdsa.util.sigdecode_string,
allow_truncate=False
)
except Exception:
return False

Expand Down
4 changes: 2 additions & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <0.15', 'rsa'] + pyasn1
legacy_backend_requires = ['ecdsa != 0.15', 'rsa'] + pyasn1
install_requires = ['six <2.0']

# TODO: work this into the extras selection instead.
Expand Down Expand Up @@ -78,7 +78,7 @@ def _cryptography_version():
],
tests_require=[
'six',
'ecdsa<0.15',
'ecdsa != 0.15',
'pytest',
'pytest-cov',
'pytest-runner',
Expand Down