Upstream PRs 1574, 1576, 1575, 1577, 1578, 1583, 1586, 1600, 1604, 1554#318
Merged
real-or-random merged 25 commits intoBlockstreamResearch:masterfrom Feb 13, 2026
Merged
Conversation
The `CTest` module handles `CDash` integration, which we do not use. It is not required for testing functionality.
This change simplifies the code. Also comments has been added to highlight the code structure.
This fixes a bug introduced in 7d2591c that prevented compiling the library without enabling the extrakeys module.
…ule isn't enabled 763d938 ci: only enable extrakeys module when schnorrsig is enabled (Jonas Nick) af551ab tests: do not use functions from extrakeys module (Jonas Nick) Pull request description: ACKs for top commit: sipa: ACK 763d938 hebasto: ACK 763d938. Tree-SHA512: a5d52e69af896e7bb43c6826f269b5f26e8d1b8c0d040d71a369fdaebf894e47dcf9ff1bbe1b62864adb85437d2c93eabd655c4d690d5d894b712145c2bd252f
…hub label in release process 759bd4b doc: mention `needs-changelog` github label in release process (Jonas Nick) Pull request description: ACKs for top commit: sipa: ACK 759bd4b Tree-SHA512: fc38f0da81fee10c46dc22409d27dfe2742555991328554fc6b7eb3d1f3e50fea6213ebd10d5b58473aa89a21117a46f97b36f5cf50e7f95197a339ccc185447
40d87b8 release: prepare for 0.5.1 (Jonas Nick) 5770226 changelog: clarify CMake option (Jonas Nick) Pull request description: ACKs for top commit: sipa: ACK 40d87b8 hebasto: ACK 40d87b8. Tree-SHA512: f021cd948239ad1a9b2feb854a95d4a559f06a559d0e4932bc176458475f13a81082a2f7410f2fc6ae259c93a484101f44ff1d3f720773c0fda877562de08bc3
…r 0.5.1 c3e40d7 release cleanup: bump version after 0.5.1 (Jonas Nick) Pull request description: ACKs for top commit: sipa: ACK c3e40d7 hebasto: ACK c3e40d7. Tree-SHA512: e7ae20a4b88c046c66720a6f8a2ba0c47e113bb95357020908dd378e58633d86f5fdd6b1e3d552da5ba3e0a7ba7de918a561862f66ef7c909ea64045a50955ef
…all warnings 7057d3c ci: Silent Homebrew's noisy reinstall warnings (Hennadii Stepanov) Pull request description: Homebrew's warnings are quite noisy on the master branch:  This PR silents them to allow us to focus on any other CI infra warnings once they happen. ACKs for top commit: real-or-random: utACK 7057d3c Tree-SHA512: 4dbdb459e97cb5956219214fd7407ec52fc018dba24ae945337ad5c94df510472cfc708f9f67d4df5b8e983bf4e78b2efd56533f28113b3463a1397d4d7a032a
The previous code is correct and harmless to initialize an array with a
non-terminated character sequence using a string literal.
However, it requires exactly specifying the array size, which can be
cumbersome.
Also, GCC-15 may issue the -Wunterminated-string-initialization warning.
[1]
Fix both issues by using array initialization. This refactoring commit
does not change behavior.
[1] Example warning:
src/modules/schnorrsig/main_impl.h:48:46: error: initializer-string for array of 'unsigned char' is too long [-Werror=unterminated-string-initialization]
48 | static const unsigned char bip340_algo[13] = "BIP0340/nonce";
| ^~~~~~~~~~~~~~~
fa67b67 refactor: Use array initialization for unterminated strings (MarcoFalke) e34b476 ci: Bump GCC_SNAPSHOT_MAJOR to 15 (maflcko) Pull request description: Follow-up to bitcoin-core/secp256k1#1313 Clang should silently follow the `main` devel branch, but GCC needs to be bumped manually. ACKs for top commit: hebasto: ACK fa67b67, I have reviewed the code and it looks OK. real-or-random: utACK fa67b67 Tree-SHA512: e76371e5b1ff259ec501671872352c0d46d34a96aadae04e6ee37f9457308412e18010e724df667a15c3a85997a16da191f50cd3a01ee3f20d5f16b5893d179a
…eader file comment 9b0f37b fix: remove duplicate 'the' from header file comment (Epic Curious) Pull request description: Replaces: ` * Changes w.r.t. the the paper:` With: ` * Changes w.r.t. the paper:` in the `include/secp256k1_ellswift.h` header file. ACKs for top commit: real-or-random: ACK 9b0f37b Tree-SHA512: a0ac153d91f0d27959d626ede116e5322fcab7e32d8e6e81bd570cbb3eae55054ab6d0310bdf963bf4fddf9792c79fad61bc90a69bc24ab5234f29e4a2763ef3
Downstream projects may include libsecp test executables in their test suites. In such cases, if a `-fsanitize=...` flag is passed via the `SECP256K1_APPEND_CFLAGS` variable, the same flag must also be passed to the linker.
…_LDFLAGS` variable 421ed1b cmake: Introduce `SECP256K1_APPEND_LDFLAGS` variable (Hennadii Stepanov) Pull request description: ACKs for top commit: jonasnick: ACK 421ed1b Tree-SHA512: 044b84b86a98e30268189dc92c4b8045e146451f3849a9863eb8f99490df53f1f02ae0fc74d74dc6ede0ea0c55653c142f409c77e1967505a085f31e4c472443
…_{recoverable_,}signature` API description
292310f doc: fix typos in `secp256k1_ecdsa_{recoverable_,}signature` API description (Sebastian Falbesoner)
Pull request description:
This small PR fixes two small typos I noticed while looking at the pubkey recovery module (s/structured/structure/).
ACKs for top commit:
real-or-random:
utACK 292310f
Tree-SHA512: 7abda2d5b56d810fd83c7de9b018818a28fd5969f669b53b9dc0e1034428feef63a3157714f45002185b94c6c35617cab21861fa56dba51883d1326b4a1cb033
7c987ec cmake: Call `enable_testing()` unconditionally (Hennadii Stepanov) 6aa5765 cmake: Delete `CTest` module (Hennadii Stepanov) Pull request description: 1. Delete `CTest` module. The `CTest` module handles `CDash` integration, which we do not use. It is not required for testing functionality. 2. Clean up cases when to invoke `enable_testing()` The `enable_testing()` command invocation is required for `add_test()` commands, which are used only for `{noverify_}tests`, `exhaustive_tests` and examples. ACKs for top commit: real-or-random: utACK 7c987ec theStack: ACK 7c987ec Tree-SHA512: f2628a4c4363b86f7c49d705df192e76368997e3f01cb736fcc272330bbf481af023d29d9faec17878d3bf74e4d265870cd93953406ae4612cd717811f22dd1a
real-or-random
merged commit 211323d
into
BlockstreamResearch:master
106 of 116 checks passed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Merge bitcoin-core/secp256k1#1574: Fix compilation when extrakeys module isn't enabled
Merge bitcoin-core/secp256k1#1576: doc: mention
needs-changeloggithub label in release processMerge bitcoin-core/secp256k1#1575: release: prepare for 0.5.1
Merge bitcoin-core/secp256k1#1577: release cleanup: bump version after 0.5.1
Merge bitcoin-core/secp256k1#1578: ci: Silent Homebrew's noisy reinstall warnings
Merge bitcoin-core/secp256k1#1583: ci: Bump GCC_SNAPSHOT_MAJOR to 15
Merge bitcoin-core/secp256k1#1586: fix: remove duplicate 'the' from header file comment
Merge bitcoin-core/secp256k1#1600: cmake: Introduce
SECP256K1_APPEND_LDFLAGSvariableMerge bitcoin-core/secp256k1#1604: doc: fix typos in
secp256k1_ecdsa_{recoverable_,}signatureAPI descriptionMerge bitcoin-core/secp256k1#1554: cmake: Clean up testing code
This PR can be recreated with
./contrib/sync-upstream.sh -b master range 4c57c7a.Tips:
git show --remerge-diff <pr-branch>to show the conflict resolution in the merge commit.git read-tree --reset -u <pr-branch>to replay these resolutions during the conflict resolution stage when recreating the PR branch locally.Be aware that this may discard your index as well as the uncommitted changes and untracked files in your worktree.