mirror of
https://github.com/bitcoin/bitcoin.git
synced 2026-06-03 17:54:19 +02:00
Squashed 'src/secp256k1/' changes from bdf39000b9..4258c54f4e
4258c54f4e Merge bitcoin-core/secp256k1#1276: autotools: Don't regenerate Wycheproof header automatically 06c67dea9f autotools: Don't regenerate Wycheproof header automatically 3bab71cf05 Merge bitcoin-core/secp256k1#1268: release cleanup: bump version after 0.3.1 656c6ea8d8 release cleanup: bump version after 0.3.1 346a053d4c Merge bitcoin-core/secp256k1#1269: changelog: Fix link 6a37b2a5ea changelog: Fix link ec98fcedd5 Merge bitcoin-core/secp256k1#1266: release: Prepare for 0.3.1 898e1c676e release: Prepare for 0.3.1 1d9a13fc26 changelog: Remove inconsistent newlines 0e091669a1 changelog: Catch up in preparation of 0.3.1 7b7503dac5 Merge bitcoin-core/secp256k1#1245: tests: Add Wycheproof ECDSA vectors 145078c418 Merge bitcoin-core/secp256k1#1118: Add x-only ecmult_const version with x specified as n/d e5de454609 tests: Add Wycheproof ECDSA vectors 0f8642079b Add exhaustive tests for ecmult_const_xonly 4485926ace Add x-only ecmult_const version for x=n/d a0f4644f7e Merge bitcoin-core/secp256k1#1252: Make position of * in pointer declarations in include/ consistent 4e682626a3 Merge bitcoin-core/secp256k1#1226: Add CMake instructions to release process 2d51a454fc Merge bitcoin-core/secp256k1#1257: ct: Use volatile "trick" in all fe/scalar cmov implementations 4a496a36fb ct: Use volatile "trick" in all fe/scalar cmov implementations 3d1f430f9f Make position of * in pointer declarations in include/ consistent 2bca0a5cbf Merge bitcoin-core/secp256k1#1241: build: Improve `SECP_TRY_APPEND_DEFAULT_CFLAGS` macro afd8b23b27 Merge bitcoin-core/secp256k1#1244: Suppress `-Wunused-parameter` when building for coverage analysis 1d8f367515 Merge bitcoin-core/secp256k1#1250: No need to subtract 1 before doing a right shift 3e43041be6 No need to subtract 1 before doing a right shift 3addb4c1e8 build: Improve `SECP_TRY_APPEND_DEFAULT_CFLAGS` macro 0c07c82834 Add CMake instructions to release process 464a9115b4 Merge bitcoin-core/secp256k1#1242: Set ARM ASM symbol visibility to `hidden` f16a709fd6 Merge bitcoin-core/secp256k1#1247: Apply Checks only in VERIFY mode. 70be3cade5 Merge bitcoin-core/secp256k1#1246: Typo 4ebd82852d Apply Checks only in VERIFY mode. d1e7ca192d Typo 5bb03c2911 Replace `SECP256K1_ECMULT_TABLE_VERIFY` macro by a function 9c8c4f443c Merge bitcoin-core/secp256k1#1238: build: bump CMake minimum requirement to 3.13 0cf2fb91ef Merge bitcoin-core/secp256k1#1243: build: Ensure no optimization when building for coverage analysis fd2a408647 Set ARM ASM symbol visibility to `hidden` 4429a8c218 Suppress `-Wunused-parameter` when building for coverage analysis 8e79c7ed11 build: Ensure no optimization when building for coverage analysis 96dd062511 build: bump CMake minimum requirement to 3.13 427bc3cdcf Merge bitcoin-core/secp256k1#1236: Update comment for secp256k1_modinv32_inv256 647f0a5cb1 Update comment for secp256k1_modinv32_inv256 5658209459 Merge bitcoin-core/secp256k1#1228: release cleanup: bump version after 0.3.0 28e63f7ea7 release cleanup: bump version after 0.3.0 git-subtree-dir: src/secp256k1 git-subtree-split: 4258c54f4ebfc09390168e8a43306c46b315134b
This commit is contained in:
Pieter Wuille
114
tools/tests_wycheproof_generate.py
Executable file
114
tools/tests_wycheproof_generate.py
Executable file
@@ -0,0 +1,114 @@
|
||||
#!/usr/bin/env python3
|
||||
# Copyright (c) 2023 Random "Randy" Lattice and Sean Andersen
|
||||
# Distributed under the MIT software license, see the accompanying
|
||||
# file COPYING or https://www.opensource.org/licenses/mit-license.php.
|
||||
'''
|
||||
Generate a C file with ECDSA testvectors from the Wycheproof project.
|
||||
'''
|
||||
|
||||
import json
|
||||
import hashlib
|
||||
import urllib.request
|
||||
import sys
|
||||
|
||||
filename_input = sys.argv[1]
|
||||
|
||||
with open(filename_input) as f:
|
||||
doc = json.load(f)
|
||||
|
||||
num_groups = len(doc['testGroups'])
|
||||
|
||||
def to_c_array(x):
|
||||
if x == "": return ""
|
||||
s = ',0x'.join(a+b for a,b in zip(x[::2], x[1::2]))
|
||||
return "0x" + s
|
||||
|
||||
|
||||
num_vectors = 0
|
||||
offset_msg_running, offset_pk_running, offset_sig = 0, 0, 0
|
||||
out = ""
|
||||
messages = ""
|
||||
signatures = ""
|
||||
public_keys = ""
|
||||
cache_msgs = {}
|
||||
cache_public_keys = {}
|
||||
|
||||
for i in range(num_groups):
|
||||
group = doc['testGroups'][i]
|
||||
num_tests = len(group['tests'])
|
||||
public_key = group['publicKey']
|
||||
for j in range(num_tests):
|
||||
test_vector = group['tests'][j]
|
||||
# // 2 to convert hex to byte length
|
||||
sig_size = len(test_vector['sig']) // 2
|
||||
msg_size = len(test_vector['msg']) // 2
|
||||
|
||||
if test_vector['result'] == "invalid": expected_verify = 0
|
||||
elif test_vector['result'] == "valid": expected_verify = 1
|
||||
else: raise ValueError("invalid result field")
|
||||
|
||||
if num_vectors != 0 and sig_size != 0: signatures += ",\n "
|
||||
|
||||
new_msg = False
|
||||
msg = to_c_array(test_vector['msg'])
|
||||
msg_offset = offset_msg_running
|
||||
# check for repeated msg
|
||||
if msg not in cache_msgs.keys():
|
||||
if num_vectors != 0 and msg_size != 0: messages += ",\n "
|
||||
cache_msgs[msg] = offset_msg_running
|
||||
messages += msg
|
||||
new_msg = True
|
||||
else:
|
||||
msg_offset = cache_msgs[msg]
|
||||
|
||||
new_pk = False
|
||||
pk = to_c_array(public_key['uncompressed'])
|
||||
pk_offset = offset_pk_running
|
||||
# check for repeated pk
|
||||
if pk not in cache_public_keys.keys():
|
||||
if num_vectors != 0: public_keys += ",\n "
|
||||
cache_public_keys[pk] = offset_pk_running
|
||||
public_keys += pk
|
||||
new_pk = True
|
||||
else:
|
||||
pk_offset = cache_public_keys[pk]
|
||||
|
||||
signatures += to_c_array(test_vector['sig'])
|
||||
|
||||
out += " /" + "* tcId: " + str(test_vector['tcId']) + ". " + test_vector['comment'] + " *" + "/\n"
|
||||
out += " {" + "{0}, {1}, {2}, {3}, {4}, {5}".format(
|
||||
pk_offset,
|
||||
msg_offset,
|
||||
msg_size,
|
||||
offset_sig,
|
||||
sig_size,
|
||||
expected_verify) + " },\n"
|
||||
if new_msg: offset_msg_running += msg_size
|
||||
if new_pk: offset_pk_running += 65
|
||||
offset_sig += sig_size
|
||||
num_vectors += 1
|
||||
|
||||
struct_definition = """
|
||||
typedef struct {
|
||||
size_t pk_offset;
|
||||
size_t msg_offset;
|
||||
size_t msg_len;
|
||||
size_t sig_offset;
|
||||
size_t sig_len;
|
||||
int expected_verify;
|
||||
} wycheproof_ecdsa_testvector;
|
||||
"""
|
||||
|
||||
|
||||
print("/* Note: this file was autogenerated using tests_wycheproof_generate.py. Do not edit. */")
|
||||
print("#define SECP256K1_ECDSA_WYCHEPROOF_NUMBER_TESTVECTORS ({})".format(num_vectors))
|
||||
|
||||
print(struct_definition)
|
||||
|
||||
print("static const unsigned char wycheproof_ecdsa_messages[] = { " + messages + "};\n")
|
||||
print("static const unsigned char wycheproof_ecdsa_public_keys[] = { " + public_keys + "};\n")
|
||||
print("static const unsigned char wycheproof_ecdsa_signatures[] = { " + signatures + "};\n")
|
||||
|
||||
print("static const wycheproof_ecdsa_testvector testvectors[SECP256K1_ECDSA_WYCHEPROOF_NUMBER_TESTVECTORS] = {")
|
||||
print(out)
|
||||
print("};")
|
||||
Reference in New Issue
Block a user