Upstream PRs 1846, 1848, 1849#363
Merged
Merged
Conversation
The `ilammy/msvc-dev-cmd` repository seems abandoned and should be considered unsafe. This updates the workflow to load the MSVC environment variables directly via `vcvars64.bat`. See https://learn.microsoft.com/en-us/cpp/build/building-on-the-command-line.
…with manual MSVC setup 285cb78 ci: Replace `ilammy/msvc-dev-cmd` with manual MSVC setup (Hennadii Stepanov) Pull request description: The `ilammy/msvc-dev-cmd` repository seems [abandoned](ilammy/msvc-dev-cmd#103) and should be considered unsafe. This PR updates the workflow to load the MSVC environment variables directly via [`vcvars64.bat`](https://learn.microsoft.com/en-us/cpp/build/building-on-the-command-line). For reference, the Bitcoin Core project removed `ilammy/msvc-dev-cmd` in bitcoin/bitcoin#32513. **Note for Maintainers:** Once this PR is merged and other PRs are rebased on top of it, the `ilammy/msvc-dev-cmd` action should be removed from the "Action permission" settings in this repository. ACKs for top commit: real-or-random: utACK bitcoin-core/secp256k1@285cb78 Tree-SHA512: 3faa9a316438ae3f4e7352890a77baaf0bf0adda4086111344d8279dc869a42ea837269527268fad1a2dd2e1893fd8fc51e5c3b205f394926b07988579a10ad9
…n to 17 3cca645 ci: Bump GCC snapshot major version to 17 (Hennadii Stepanov) Pull request description: See https://gcc.gnu.org/pipermail/gcc/2026-April/248048.html. ACKs for top commit: real-or-random: utACK 3cca645 Tree-SHA512: 36c975c500cb0411f20189a3b451b58268ff15be08ff444833e27ae37b53bf7581ba8a8c48b393a9b96050f8c498242ba2fb5e593caee492f1fcb1182cc948bc
…ter` Even though `secp256k1_musig_nonce_gen_internal` can currently only fail if the API is misused (invalid `keypair` or `keyagg_cache` parameters), clear out the buffer holding secret key data as well in this case to follow best practices. The issue was found and reported by l0rinc using GPT 5.5 (Thanks!).
… in `secp256k1_musig_nonce_gen_counter` 8479eaf musig: always clear out secret key in `secp256k1_musig_nonce_gen_counter` (Sebastian Falbesoner) Pull request description: Even though `secp256k1_musig_nonce_gen_internal` can currently only fail if the surrounding API function is misused (invalid `keypair` or `keyagg_cache` parameters, making the corresponding [seckey validation](https://github.com/bitcoin-core/secp256k1/blob/c1a9e4fe6471478dba9c5ef61105b9c5213c6bf1/src/modules/musig/session_impl.h#L391) or [pubkey](https://github.com/bitcoin-core/secp256k1/blob/c1a9e4fe6471478dba9c5ef61105b9c5213c6bf1/src/modules/musig/session_impl.h#L404)/[keyaggcache](https://github.com/bitcoin-core/secp256k1/blob/c1a9e4fe6471478dba9c5ef61105b9c5213c6bf1/src/modules/musig/session_impl.h#L397) load calls fail), clearing out the stack memory holding the secret key as well in this case seems reasonable to follow best practices. The issue was reported off-band by l0rinc (thanks!), in the course of analyzing the secp repository with AI tooling. ACKs for top commit: furszy: ACK 8479eaf real-or-random: utACK 8479eaf Tree-SHA512: dc15ed7518c6cd0b1b86d2e0382c546374e94a1c1fa15639ba3db27e083ce53a24ddf4d3cd3328b4dc229258d8cbb0e01f4b63f025d04254845f2bf20cfa5289
Collaborator
|
ACK b11340b. This sync PR can be merged as-is. |
Contributor
|
ACK b11340b |
Member
Author
done |
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
5 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.
This PR has been created by a GitHub Actions workflow without human involvement.
[bitcoin-core/secp256k1#1846]: ci: Replace
ilammy/msvc-dev-cmdwith manual MSVC setup[bitcoin-core/secp256k1#1848]: ci: Bump GCC snapshot major version to 17
[bitcoin-core/secp256k1#1849]: musig: always clear out secret key in
secp256k1_musig_nonce_gen_counterTips:
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.