Skip to content

Remove the unused hmac_compat wrapper #383

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

Open
Cherith1222 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove the unused hmac_compat wrapper #383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 0 additions & 6 deletions src/ecdsa/_compat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@ def normalise_bytes(buffer_object):
# flake8 runs on py3 where `buffer` indeed doesn't exist...
return buffer(buffer_object) # noqa: F821

def hmac_compat(ret):
return ret

if (
sys.version_info < (2, 7)
or sys.version_info < (2, 7, 4)
Expand Down Expand Up @@ -92,9 +89,6 @@ def int_to_bytes(val, length=None, byteorder="big"):

else:

def hmac_compat(data):
return data

def normalise_bytes(buffer_object):
"""Cast the input into array of bytes."""
return memoryview(buffer_object).cast("B")
Expand Down
7 changes: 3 additions & 4 deletions src/ecdsa/rfc6979.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
import hmac
from binascii import hexlify
from .util import number_to_string, number_to_string_crop, bit_length
from ._compat import hmac_compat


# bit_length was defined in this module previously so keep it for backwards
Expand Down Expand Up @@ -59,9 +58,9 @@ def generate_k(order, secexp, hash_func, data, retry_gen=0, extra_entropy=b""):
holen = hash_func().digest_size
rolen = (qlen + 7) // 8
bx = (
hmac_compat(number_to_string(secexp, order)),
hmac_compat(bits2octets(data, order)),
hmac_compat(extra_entropy),
number_to_string(secexp, order),
bits2octets(data, order),
extra_entropy,
)

# Step B
Expand Down