Skip to content

Commit a2cadec

Browse files
committed
libsecp256k1: remove secp256k1_fe_equal_var
This was removed upstream, bitcoin-core/secp256k1#1062, and is causing build failures downstream: ```bash clang++ -O1 -fno-omit-frame-pointer -gline-tables-only -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION -fsanitize=address -fsanitize-address-use-after-scope -fsanitize=fuzzer-no-link -stdlib=libc++ -DCRYPTOFUZZ_NO_OPENSSL -I /src/boost_1_74_0/ -DCRYPTOFUZZ_SECP256K1 -DCRYPTOFUZZ_TREZOR_FIRMWARE -DCRYPTOFUZZ_BOTAN -DCRYPTOFUZZ_BOTAN_IS_ORACLE -DCRYPTOFUZZ_BITCOIN -Wall -Wextra -std=c++17 -I include/ -I . -I fuzzing-headers/include -DFUZZING_HEADERS_NO_IMPL driver.o executor.o util.o entry.o tests.o operation.o datasource.o repository.o options.o components.o wycheproof.o crypto.o expmod.o mutator.o z3.o numbers.o mutatorpool.o ecc_diff_fuzzer_importer.o ecc_diff_fuzzer_exporter.o botan_importer.o openssl_importer.o builtin_tests_importer.o bignum_fuzzer_importer.o modules/botan/module.a modules/secp256k1/module.a modules/trezor/module.a modules/bitcoin/module.a -fsanitize=fuzzer third_party/cpu_features/build/libcpu_features.a -o cryptofuzz /usr/bin/ld: /usr/bin/ld: DWARF error: invalid or unhandled FORM value: 0x25 modules/secp256k1/module.a(secp256k1_api.o): in function `cryptofuzz_secp256k1_fe_equal_var': secp256k1_api.c:(.text.cryptofuzz_secp256k1_fe_equal_var[cryptofuzz_secp256k1_fe_equal_var]+0x27): undefined reference to `secp256k1_fe_equal_var' /usr/bin/ld: secp256k1_api.c:(.text.cryptofuzz_secp256k1_fe_equal_var[cryptofuzz_secp256k1_fe_equal_var]+0x39): undefined reference to `secp256k1_fe_equal_var' clang-15: error: linker command failed with exit code 1 (use -v to see invocation) make: *** [Makefile:59: cryptofuzz] Error 1 ERROR:__main__:Building fuzzers failed. ```
1 parent 7b75bc5 commit a2cadec

File tree

3 files changed

+1
-12
lines changed

3 files changed

+1
-12
lines changed

modules/secp256k1/module.cpp

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1531,13 +1531,7 @@ namespace secp256k1_detail {
15311531
break;
15321532
case CF_CALCOP("IsEq(A,B)"):
15331533
{
1534-
bool var = false;
1535-
try { var = ds.Get<bool>(); } catch ( ... ) { }
1536-
1537-
const int r =
1538-
var == false ?
1539-
cryptofuzz_secp256k1_fe_equal(a, b) :
1540-
cryptofuzz_secp256k1_fe_equal_var(a, b);
1534+
const int r = cryptofuzz_secp256k1_fe_equal(a, b);
15411535

15421536
CF_NORET(cryptofuzz_secp256k1_fe_set_int(res, r));
15431537
}

modules/secp256k1/secp256k1_api.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -145,10 +145,6 @@ int cryptofuzz_secp256k1_fe_equal(const void *a, const void *b) {
145145
return secp256k1_fe_equal(a, b);
146146
}
147147

148-
int cryptofuzz_secp256k1_fe_equal_var(const void *a, const void *b) {
149-
return secp256k1_fe_equal_var(a, b);
150-
}
151-
152148
int cryptofuzz_secp256k1_fe_cmp_var(const void *a, const void *b) {
153149
return secp256k1_fe_cmp_var(a, b);
154150
}

modules/secp256k1/secp256k1_api.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ int cryptofuzz_secp256k1_fe_is_odd(const void *a);
4040
int cryptofuzz_secp256k1_fe_is_zero(const void *a);
4141
void cryptofuzz_secp256k1_fe_clear(void *r);
4242
int cryptofuzz_secp256k1_fe_equal(const void *a, const void *b);
43-
int cryptofuzz_secp256k1_fe_equal_var(const void *a, const void *b);
4443
int cryptofuzz_secp256k1_fe_cmp_var(const void *a, const void *b);
4544
void cryptofuzz_secp256k1_fe_cmov(void *r, const void *a, const int flag);
4645
size_t cryptofuzz_secp256k1_fe_storage_size(void);

0 commit comments

Comments
 (0)