Skip to content

Commit c383795

Browse files
authored
bitcoin-core: fix seccp256k1 configure option (#12299)
This option was renamed in bitcoin-core/secp256k1#1058, resulting in `configure: WARNING: unrecognized options: --with-ecmult-gen-precision`. Update the option and change the values. Also add `--enable-option-checking`, so that it'll be harder for this to happen in future. See: https://www.gnu.org/savannah-checkouts/gnu/autoconf/manual/autoconf-2.72/html_node/Option-Checking.html.
1 parent 999f374 commit c383795

File tree

1 file changed

+11
-10
lines changed

1 file changed

+11
-10
lines changed

projects/bitcoin-core/build_cryptofuzz.sh

+11-10
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@ function build_libsecp256k1() {
5252
--enable-module-recovery
5353
--enable-experimental
5454
--enable-module-schnorrsig
55-
--enable-module-ecdh"
55+
--enable-module-ecdh
56+
--enable-option-checking"
5657

5758
if [[ $CFLAGS = *sanitize=memory* ]]
5859
then
@@ -151,31 +152,31 @@ cd ../../
151152
# Build with 3 configurations of libsecp256k1
152153
# Discussion: https://github.com/google/oss-fuzz/pull/5717#issuecomment-842765383
153154

154-
build_libsecp256k1 "--with-ecmult-window=2" "--with-ecmult-gen-precision=2"
155+
build_libsecp256k1 "--with-ecmult-window=2" "--with-ecmult-gen-kb=2"
155156
cd $SRC/cryptofuzz/
156157
make -B -j$(nproc)
157-
cp cryptofuzz $OUT/cryptofuzz-bitcoin-cryptography-w2-p2
158+
cp cryptofuzz $OUT/cryptofuzz-bitcoin-cryptography-w2-kb2
158159

159-
build_libsecp256k1 "--with-ecmult-window=15" "--with-ecmult-gen-precision=4"
160+
build_libsecp256k1 "--with-ecmult-window=15" "--with-ecmult-gen-kb=22"
160161
cd $SRC/cryptofuzz/
161162
rm cryptofuzz
162163
make
163-
cp cryptofuzz $OUT/cryptofuzz-bitcoin-cryptography-w15-p4
164+
cp cryptofuzz $OUT/cryptofuzz-bitcoin-cryptography-w15-kb22
164165

165166
# If the window size is larger than 15, this file must be deleted before proceeding
166167
rm $SRC/secp256k1/src/precomputed_ecmult.c
167-
build_libsecp256k1 "--with-ecmult-window=20" "--with-ecmult-gen-precision=8"
168+
build_libsecp256k1 "--with-ecmult-window=20" "--with-ecmult-gen-kb=86"
168169
cd $SRC/cryptofuzz/
169170
rm cryptofuzz
170171
make
171-
cp cryptofuzz $OUT/cryptofuzz-bitcoin-cryptography-w20-p8
172+
cp cryptofuzz $OUT/cryptofuzz-bitcoin-cryptography-w20-kb86
172173

173174
# Convert Wycheproof test vectors to Cryptofuzz corpus format
174175
mkdir $SRC/corpus-cryptofuzz-wycheproof/
175176
find $SRC/wycheproof/testvectors/ -type f -name 'ecdsa_secp256k1_*' -exec $SRC/cryptofuzz/cryptofuzz --from-wycheproof={},$SRC/corpus-cryptofuzz-wycheproof/ \;
176177
# Pack the Wycheproof test vectors
177178
zip -j cryptofuzz-bitcoin-cryptography_seed_corpus.zip $SRC/corpus-cryptofuzz-wycheproof/*
178179
# Use them as the seed corpus for each of the fuzzers
179-
cp cryptofuzz-bitcoin-cryptography_seed_corpus.zip $OUT/cryptofuzz-bitcoin-cryptography-w2-p2_seed_corpus.zip
180-
cp cryptofuzz-bitcoin-cryptography_seed_corpus.zip $OUT/cryptofuzz-bitcoin-cryptography-w15-p4_seed_corpus.zip
181-
cp cryptofuzz-bitcoin-cryptography_seed_corpus.zip $OUT/cryptofuzz-bitcoin-cryptography-w20-p8_seed_corpus.zip
180+
cp cryptofuzz-bitcoin-cryptography_seed_corpus.zip $OUT/cryptofuzz-bitcoin-cryptography-w2-kb2_seed_corpus.zip
181+
cp cryptofuzz-bitcoin-cryptography_seed_corpus.zip $OUT/cryptofuzz-bitcoin-cryptography-w15-kb22_seed_corpus.zip
182+
cp cryptofuzz-bitcoin-cryptography_seed_corpus.zip $OUT/cryptofuzz-bitcoin-cryptography-w20-kb86_seed_corpus.zip

0 commit comments

Comments
 (0)