arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-01-16 02:10:55 +00:00
Code Issues Releases Wiki Activity

ed25519: remove py2/py3 handling in ed25519 funcs as well

Browse Source
This commit is contained in:
Pavol Rusnak 2017-12-18 22:33:55 +01:00
parent a9291e89c5
commit c1b1bedb8c
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
2 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
trezorlib/ed25519cosi.py
View File

@ -21,9 +21,6 @@ def combine_sig(R, sigs):
def get_nonce(sk, data, ctr): def get_nonce(sk, data, ctr):
h = ed25519raw.H(sk) h = ed25519raw.H(sk)
b = ed25519raw.b b = ed25519raw.b
if sys.version_info.major < 3:
r = ed25519raw.Hint(''.join([h[i] for i in range(b >> 3, b >> 2)]) + data + binascii.unhexlify('%08x' % ctr))
else:
r = ed25519raw.Hint(bytes([h[i] for i in range(b >> 3, b >> 2)]) + data + binascii.unhexlify('%08x' % ctr)) r = ed25519raw.Hint(bytes([h[i] for i in range(b >> 3, b >> 2)]) + data + binascii.unhexlify('%08x' % ctr))
R = ed25519raw.scalarmult(ed25519raw.B, r) R = ed25519raw.scalarmult(ed25519raw.B, r)
return r, ed25519raw.encodepoint(R) return r, ed25519raw.encodepoint(R)

9
trezorlib/ed25519raw.py
View File

@ -69,9 +69,6 @@ def scalarmult(P, e):
def encodeint(y): def encodeint(y):
bits = [(y >> i) & 1 for i in range(b)] bits = [(y >> i) & 1 for i in range(b)]
if sys.version_info.major < 3:
return ''.join([chr(sum([bits[i * 8 + j] << j for j in range(8)])) for i in range(b >> 3)])
else:
return bytes([sum([bits[i * 8 + j] << j for j in range(8)]) for i in range(b >> 3)]) return bytes([sum([bits[i * 8 + j] << j for j in range(8)]) for i in range(b >> 3)])
@ -79,16 +76,10 @@ def encodepoint(P):
x = P[0] x = P[0]
y = P[1] y = P[1]
bits = [(y >> i) & 1 for i in range(b - 1)] + [x & 1] bits = [(y >> i) & 1 for i in range(b - 1)] + [x & 1]
if sys.version_info.major < 3:
return ''.join([chr(sum([bits[i * 8 + j] << j for j in range(8)])) for i in range(b >> 3)])
else:
return bytes([sum([bits[i * 8 + j] << j for j in range(8)]) for i in range(b >> 3)]) return bytes([sum([bits[i * 8 + j] << j for j in range(8)]) for i in range(b >> 3)])
def bit(h, i): def bit(h, i):
if sys.version_info.major < 3:
return (ord(h[i >> 3]) >> (i & 7)) & 1
else:
return (h[i >> 3] >> (i & 7)) & 1 return (h[i >> 3] >> (i & 7)) & 1