Skip to content

Commit 498ffcb

Browse files
hebastojanus
authored andcommitted
Squashed 'src/secp256k1/' changes from 0cdc758a56..4187a46649
4187a46649 Merge bitcoin-core/secp256k1#1492: tests: Add Wycheproof ECDH vectors e266ba11ae tests: Add Wycheproof ECDH vectors 13906b7154 Merge bitcoin-core/secp256k1#1669: gitignore: Add Python cache files c1bcb03276 gitignore: Add Python cache files 70f149b9a1 Merge bitcoin-core/secp256k1#1662: bench: add ellswift to bench help output 6b3fe51fb6 bench: add ellswift to bench help output d84bb83e26 Merge bitcoin-core/secp256k1#1661: configure: Show exhaustive tests in summary 3f54ed8c1b Merge bitcoin-core/secp256k1#1659: include: remove WARN_UNUSED_RESULT for functions always returning 1 20b05c9d3f configure: Show exhaustive tests in summary e56716a3bc Merge bitcoin-core/secp256k1#1660: ci: Fix exiting from ci.sh on error d87c3bc58f ci: Fix exiting from ci.sh on error 1b6e081538 include: remove WARN_UNUSED_RESULT for functions always returning 1 2abb35b034 Merge bitcoin-core/secp256k1#1657: tests: remove unused uncounting_illegal_callback_fn 51907fa918 tests: remove unused uncounting_illegal_callback_fn a7a5117144 Merge bitcoin-core/secp256k1#1359: Fix symbol visibility issues, add test for it 13ed6f65dc Merge bitcoin-core/secp256k1#1593: Remove deprecated `_ec_privkey_{negate,tweak_add,tweak_mul}` aliases from API d1478763a5 build: Drop no longer needed `-fvisibility=hidden` compiler option 8ed1d83d92 ci: Run `tools/symbol-check.py` 41d32ab2de test: Add `tools/symbol-check.py` 88548058b3 Introduce `SECP256K1_LOCAL_VAR` macro 03bbe8c615 Merge bitcoin-core/secp256k1#1655: gha: Print all *.log files, in a separate action 59860bcc24 gha: Print all *.log files, in a separate action 4ba1ba2af9 Merge bitcoin-core/secp256k1#1647: cmake: Adjust diagnostic flags for `clang-cl` abd25054a1 Merge bitcoin-core/secp256k1#1656: musig: Fix clearing of pubnonces 961ec25a83 musig: Fix clearing of pubnonces 3186082387 Merge bitcoin-core/secp256k1#1614: Add _ge_set_all_gej and use it in musig for own public nonces 6c2a39dafb Merge bitcoin-core/secp256k1#1639: Make static context const 37d2c60bec Remove deprecated _ec_privkey_{negate,tweak_add,tweak_mul} aliases 432ac57705 Make static context const 1b1fc09341 Merge bitcoin-core/secp256k1#1642: Verify `compressed` argument in `secp256k1_eckey_pubkey_serialize` c0d9480fbb Merge bitcoin-core/secp256k1#1654: use `EXIT_` constants over magic numbers for indicating program execution status 13d389629a CONTRIBUTING: mention that `EXIT_` codes should be used c855581728 test, bench, precompute_ecmult: use `EXIT_...` constants for `main` return values 965393fcea examples: use `EXIT_...` constants for `main` return values 2e3bf13653 Merge bitcoin-core/secp256k1#1646: README: add instructions for verifying GPG signatures b682dbcf84 README: add instructions for verifying GPG signatures 00774d0723 Merge bitcoin-core/secp256k1#1650: schnorrsig: clear out masked secret key in BIP-340 nonce function a82287fb85 schnorrsig: clear out masked secret key in BIP-340 nonce function 4c50d73dd9 ci: Add new "Windows (clang-cl)" job 84c0bd1f72 cmake: Adjust diagnostic flags for clang-cl f79f46c703 Merge bitcoin-core/secp256k1#1641: doc: Improve cmake instructions in README 2ac9f558c4 doc: Improve cmake instructions in README 1823594761 Verify `compressed` argument in `secp256k1_eckey_pubkey_serialize` 8deef00b33 Merge bitcoin-core/secp256k1#1634: Fix some misspellings 39705450eb Fix some misspellings ec329c2501 Merge bitcoin-core/secp256k1#1633: release cleanup: bump version after 0.6.0 c97059f594 release cleanup: bump version after 0.6.0 64228a648f musig: Use _ge_set_all_gej for own public nonces 300aab1c05 tests: Improve _ge_set_all_gej(_var) tests 365f274ce3 group: Simplify secp256k1_ge_set_all_gej d3082ddead group: Add constant-time secp256k1_ge_set_all_gej git-subtree-dir: src/secp256k1 git-subtree-split: 4187a4664914dc6f6fb6a619c6b85c854fc33033
1 parent c45f1bf commit 498ffcb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+11986
-533
lines changed

.cirrus.yml

Lines changed: 9 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ env:
2929
BENCH: yes
3030
SECP256K1_BENCH_ITERS: 2
3131
CTIMETESTS: yes
32+
SYMBOL_CHECK: yes
33+
VIRTUAL_ENV: /root/venv
3234
# Compile and run the tests
3335
EXAMPLES: yes
3436

@@ -51,73 +53,13 @@ cat_logs_snippet: &CAT_LOGS
5153
cat_ci_env_script:
5254
- env
5355

54-
# https://cirrus-ci.org/guide/tips-and-tricks/#sharing-configuration-between-tasks
55-
filter_template: &FILTER_TEMPLATE
56-
# Allow forks to specify SKIP_BRANCH_PUSH=true and skip CI runs when a branch is pushed,
57-
# but still run CI when a PR is created.
58-
# https://cirrus-ci.org/guide/writing-tasks/#conditional-task-execution
59-
skip: $SKIP_BRANCH_PUSH == "true" && $CIRRUS_PR == ""
60-
stateful: false # https://cirrus-ci.org/guide/writing-tasks/#stateful-tasks
61-
62-
base_template: &BASE_TEMPLATE
63-
<< : *FILTER_TEMPLATE
64-
merge_base_script:
65-
# Require git (used in fingerprint_script).
66-
- git --version || ( apt-get update && apt-get install -y git )
67-
- if [ "$CIRRUS_PR" = "" ]; then exit 0; fi
68-
- git fetch --depth=1 $CIRRUS_REPO_CLONE_URL "pull/${CIRRUS_PR}/merge"
69-
- git checkout FETCH_HEAD # Use merged changes to detect silent merge conflicts
70-
# Also, the merge commit is used to lint COMMIT_RANGE="HEAD~..HEAD"
71-
72-
main_template: &MAIN_TEMPLATE
73-
timeout_in: 120m # https://cirrus-ci.org/faq/#instance-timed-out
74-
ci_script:
75-
- ./ci/test_run_all.sh
76-
77-
global_task_template: &GLOBAL_TASK_TEMPLATE
78-
<< : *BASE_TEMPLATE
79-
<< : *MAIN_TEMPLATE
80-
81-
compute_credits_template: &CREDITS_TEMPLATE
82-
# https://cirrus-ci.org/pricing/#compute-credits
83-
# Only use credits for pull requests to the main repo
84-
use_compute_credits: $CIRRUS_REPO_FULL_NAME == 'BitgesellOfficial/bitgesell' && $CIRRUS_PR != ""
85-
86-
task:
87-
name: 'lint'
88-
<< : *BASE_TEMPLATE
89-
container:
90-
dockerfile: ci/lint_imagefile
91-
cpu: 1
92-
memory: 1G
93-
# For faster CI feedback, immediately schedule the linters
94-
<< : *CREDITS_TEMPLATE
95-
unshallow_script:
96-
- git fetch --unshallow --no-tags
97-
lint_script:
98-
- ./ci/lint_run.sh
99-
100-
task:
101-
name: 'tidy'
102-
<< : *GLOBAL_TASK_TEMPLATE
103-
persistent_worker:
104-
labels:
105-
type: medium
106-
env:
107-
ECDH: yes
108-
RECOVERY: yes
109-
EXTRAKEYS: yes
110-
SCHNORRSIG: yes
111-
MUSIG: yes
112-
ELLSWIFT: yes
113-
matrix:
114-
<< : *ENV_MATRIX_VALGRIND
115-
matrix:
116-
- env:
117-
CXX: i686-linux-gnu-g++
118-
- env:
119-
CXX: clang++ --target=i686-linux-gnu -gdwarf-4
120-
CXXFLAGS: -g -O2 -isystem /usr/i686-linux-gnu/include -isystem /usr/i686-linux-gnu/include/c++/10/i686-linux-gnu
56+
linux_arm64_container_snippet: &LINUX_ARM64_CONTAINER
57+
env_script:
58+
- export PATH="$VIRTUAL_ENV/bin:$PATH"
59+
- env | tee /tmp/env
60+
build_script:
61+
- DOCKER_BUILDKIT=1 docker build --file "ci/linux-debian.Dockerfile" --tag="ci_secp256k1_arm"
62+
- docker image prune --force # Cleanup stale layers
12163
test_script:
12264
- ./ci/cirrus.sh
12365
<< : *CAT_LOGS
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
name: "Print logs"
2+
description: "Print the log files produced by ci/ci.sh"
3+
runs:
4+
using: "composite"
5+
steps:
6+
- shell: bash
7+
run: |
8+
# Print the log files produced by ci/ci.sh
9+
10+
# Helper functions
11+
group() {
12+
title=$1
13+
echo "::group::$title"
14+
}
15+
endgroup() {
16+
echo "::endgroup::"
17+
}
18+
cat_file() {
19+
file=$1
20+
group "$file"
21+
cat "$file"
22+
endgroup
23+
}
24+
25+
# Print all *.log files
26+
shopt -s nullglob
27+
for file in *.log; do
28+
cat_file "$file"
29+
done
30+
31+
# Print environment
32+
group "CI env"
33+
env
34+
endgroup

0 commit comments

Comments
 (0)