diff options
author | fanquake <fanquake@gmail.com> | 2021-12-18 11:34:47 +0800 |
---|---|---|
committer | fanquake <fanquake@gmail.com> | 2021-12-18 14:47:44 +0800 |
commit | c06cda3e48e9826043ebc5790a7bb505bfbf368c (patch) | |
tree | 77f0286bae3271a764e5db3f108e26395ed173ad /src/secp256k1/.cirrus.yml | |
parent | 97b2fc03f666ccbadcd3a497303fb6577842d11f (diff) | |
parent | 314195c8be3bd7db0d5817c4fb3aa85c84363ce9 (diff) | |
download | bitcoin-c06cda3e48e9826043ebc5790a7bb505bfbf368c.tar.xz |
Merge bitcoin/bitcoin#23383: Update libsecp256k1 subtree to current master
314195c8be3bd7db0d5817c4fb3aa85c84363ce9 Remove unnecessary cast in CKey::SignSchnorr (Pieter Wuille)
a1f76cdb22e3278a48d63dd23c1fe3308daedd8c Remove --disable-openssl-tests for libsecp256k1 configure (Pieter Wuille)
86dbc4d075decb82fbba837aaa283cf0561897ad Squashed 'src/secp256k1/' changes from be8d9c262f..0559fc6e41 (Pieter Wuille)
Pull request description:
The motivation for this bump is getting rid of a cast in `CKey::SignSchnorr`; the `aux_rand` argument isn't modified by the `secp256k1_schnorrsig_sign` function, but was marked as non-`const` anyway. This is fixed now (bitcoin-core/secp256k1#966), and the cast is removed in this PR.
There are a few other relevant changes:
* (bitcoin-core/secp256k1#956): replaces a runtime-computed table with a precomputed one; this adds arouns 1 MiB to the binary size, but is a step towards significantly simplifying the API. If 1 MiB is too much, it can be reduced by 2 or 4 (or more) for a slight verification performance reduction.
* (bitcoin-core/secp256k1#983): removes (test/bench only) OpenSSL support entirely, removing the need to pass `--disable-openssl-tests` (see #23314).
* (bitcoin-core/secp256k1#810): mild performance increase for 64-bit non-x86 platforms.
* (bitcoin-core/secp256k1#1002): Make aux_rnd32==NULL behave identical to 0x0000..00 (which impacts BIP341/BIP342 signing in Bitcoin Core, making it more strictly BIP340 compliant, though not in a manner that affects security).
ACKs for top commit:
fanquake:
ACK 314195c8be3bd7db0d5817c4fb3aa85c84363ce9 - this includes a nice simplification to the lilbsecp build system (and thus our build system), and fixes issues like #22854. Did a Guix build on x86 (above), as well as a build on arm64 (except for the arm64 host):
Tree-SHA512: 0e048390fc148fbbdf5b98d9cce8c71067564e7d69d97b68347808a9bc45a04f4fc653c392c880d79d5d8b9cf282195520955581ac4f1595f6a948080cf5949d
Diffstat (limited to 'src/secp256k1/.cirrus.yml')
-rw-r--r-- | src/secp256k1/.cirrus.yml | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/src/secp256k1/.cirrus.yml b/src/secp256k1/.cirrus.yml index bf71a70839..35a9a45367 100644 --- a/src/secp256k1/.cirrus.yml +++ b/src/secp256k1/.cirrus.yml @@ -19,9 +19,9 @@ env: RECOVERY: no SCHNORRSIG: no ### test options - TEST_ITERS: + SECP256K1_TEST_ITERS: BENCH: yes - BENCH_ITERS: 2 + SECP256K1_BENCH_ITERS: 2 CTIMETEST: yes cat_logs_snippet: &CAT_LOGS @@ -171,7 +171,7 @@ task: memory: 1G env: WRAPPER_CMD: qemu-s390x - TEST_ITERS: 16 + SECP256K1_TEST_ITERS: 16 HOST: s390x-linux-gnu WITH_VALGRIND: no ECDH: yes @@ -194,7 +194,7 @@ task: memory: 1G env: WRAPPER_CMD: qemu-arm - TEST_ITERS: 16 + SECP256K1_TEST_ITERS: 16 HOST: arm-linux-gnueabihf WITH_VALGRIND: no ECDH: yes @@ -218,7 +218,7 @@ task: memory: 1G env: WRAPPER_CMD: qemu-aarch64 - TEST_ITERS: 16 + SECP256K1_TEST_ITERS: 16 HOST: aarch64-linux-gnu WITH_VALGRIND: no ECDH: yes @@ -239,7 +239,7 @@ task: memory: 1G env: WRAPPER_CMD: qemu-ppc64le - TEST_ITERS: 16 + SECP256K1_TEST_ITERS: 16 HOST: powerpc64le-linux-gnu WITH_VALGRIND: no ECDH: yes @@ -260,7 +260,7 @@ task: memory: 1G env: WRAPPER_CMD: wine64-stable - TEST_ITERS: 16 + SECP256K1_TEST_ITERS: 16 HOST: x86_64-w64-mingw32 WITH_VALGRIND: no ECDH: yes @@ -278,28 +278,26 @@ task: container: dockerfile: ci/linux-debian.Dockerfile cpu: 1 - memory: 1G + memory: 2G env: ECDH: yes RECOVERY: yes EXPERIMENTAL: yes SCHNORRSIG: yes CTIMETEST: no - EXTRAFLAGS: "--disable-openssl-tests" matrix: - name: "Valgrind (memcheck)" env: # The `--error-exitcode` is required to make the test fail if valgrind found errors, otherwise it'll return 0 (https://www.valgrind.org/docs/manual/manual-core.html) WRAPPER_CMD: "valgrind --error-exitcode=42" - TEST_ITERS: 16 + SECP256K1_TEST_ITERS: 2 - name: "UBSan, ASan, LSan" env: - CFLAGS: "-fsanitize=undefined,address" - CFLAGS_FOR_BUILD: "-fsanitize=undefined,address" + CFLAGS: "-fsanitize=undefined,address -g" UBSAN_OPTIONS: "print_stacktrace=1:halt_on_error=1" ASAN_OPTIONS: "strict_string_checks=1:detect_stack_use_after_return=1:detect_leaks=1" LSAN_OPTIONS: "use_unaligned=1" - TEST_ITERS: 32 + SECP256K1_TEST_ITERS: 32 # Try to cover many configurations with just a tiny matrix. matrix: - env: @@ -330,7 +328,7 @@ task: # ./configure correctly errors out when given CC=g++. # We hack around this by passing CC=g++ only to make. CC: gcc - MAKEFLAGS: -j2 CC=g++ CFLAGS=-fpermissive + MAKEFLAGS: -j2 CC=g++ CFLAGS=-fpermissive\ -g WERROR_CFLAGS: EXPERIMENTAL: yes ECDH: yes |