bitcoin/bips
1
0
Fork 0
mirror of https://github.com/bitcoin/bips.git synced 2025-05-12 12:03:29 +00:00
Code Issues Releases Wiki Activity

Accept seckey in the form of bytes and not int in the reference BIP-schnorr code to match the spec.

Browse Source
This commit is contained in:
Jonas Nick 2019-09-26 21:12:21 +00:00 committed by Pieter Wuille
parent e0e422a5ca
commit 78bb31c3bf
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bip-schnorr/reference.py
View File

@ -66,12 +66,16 @@ def is_quad(x):
return jacobi(x) == 1 return jacobi(x) == 1
def pubkey_gen(seckey): def pubkey_gen(seckey):
P = point_mul(G, seckey) x = int_from_bytes(seckey)
if not (1 <= x <= n - 1):
raise ValueError('The secret key must be an integer in the range 1..n-1.')
P = point_mul(G, x)
return bytes_from_point(P) return bytes_from_point(P)
def schnorr_sign(msg, seckey0): def schnorr_sign(msg, seckey0):
if len(msg) != 32: if len(msg) != 32:
raise ValueError('The message must be a 32-byte array.') raise ValueError('The message must be a 32-byte array.')
seckey0 = int_from_bytes(seckey0)
if not (1 <= seckey0 <= n - 1): if not (1 <= seckey0 <= n - 1):
raise ValueError('The secret key must be an integer in the range 1..n-1.') raise ValueError('The secret key must be an integer in the range 1..n-1.')
P = point_mul(G, seckey0) P = point_mul(G, seckey0)
@ -122,7 +126,7 @@ def test_vectors():
result = result == 'TRUE' result = result == 'TRUE'
print('\nTest vector #%-3i: ' % int(index)) print('\nTest vector #%-3i: ' % int(index))
if seckey != '': if seckey != '':
seckey = int(seckey, 16) seckey = bytes.fromhex(seckey)
pubkey_actual = pubkey_gen(seckey) pubkey_actual = pubkey_gen(seckey)
if pubkey != pubkey_actual: if pubkey != pubkey_actual:
print(' * Failed key generation.') print(' * Failed key generation.')