frost/secp256k1-zkp
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci: only enable extrakeys module when schnorrsig is enabled

Browse Source
This commit is contained in:
Jonas Nick
2024-07-22 07:36:22 +00:00
parent af551ab9db
commit 763d938cf0
3 changed files with 36 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.cirrus.yml
View File

@@ -20,6 +20,7 @@ env:
EXPERIMENTAL: no EXPERIMENTAL: no
ECDH: no ECDH: no
RECOVERY: no RECOVERY: no
EXTRAKEYS: no
SCHNORRSIG: no SCHNORRSIG: no
ELLSWIFT: no ELLSWIFT: no
### test options ### test options
@@ -66,6 +67,7 @@ task:
env: env:
ECDH: yes ECDH: yes
RECOVERY: yes RECOVERY: yes
EXTRAKEYS: yes
SCHNORRSIG: yes SCHNORRSIG: yes
ELLSWIFT: yes ELLSWIFT: yes
matrix: matrix:
@@ -82,6 +84,7 @@ task:
env: env:
ECDH: yes ECDH: yes
RECOVERY: yes RECOVERY: yes
EXTRAKEYS: yes
SCHNORRSIG: yes SCHNORRSIG: yes
ELLSWIFT: yes ELLSWIFT: yes
WRAPPER_CMD: 'valgrind --error-exitcode=42' WRAPPER_CMD: 'valgrind --error-exitcode=42'

51
.github/workflows/ci.yml vendored
View File

@@ -31,6 +31,7 @@ env:
EXPERIMENTAL: 'no' EXPERIMENTAL: 'no'
ECDH: 'no' ECDH: 'no'
RECOVERY: 'no' RECOVERY: 'no'
EXTRAKEYS: 'no'
SCHNORRSIG: 'no' SCHNORRSIG: 'no'
ELLSWIFT: 'no' ELLSWIFT: 'no'
### test options ### test options
@@ -71,18 +72,18 @@ jobs:
matrix: matrix:
configuration: configuration:
- env_vars: { WIDEMUL: 'int64', RECOVERY: 'yes' } - env_vars: { WIDEMUL: 'int64', RECOVERY: 'yes' }
- env_vars: { WIDEMUL: 'int64', ECDH: 'yes', SCHNORRSIG: 'yes', ELLSWIFT: 'yes' } - env_vars: { WIDEMUL: 'int64', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', ELLSWIFT: 'yes' }
- env_vars: { WIDEMUL: 'int128' } - env_vars: { WIDEMUL: 'int128' }
- env_vars: { WIDEMUL: 'int128_struct', ELLSWIFT: 'yes' } - env_vars: { WIDEMUL: 'int128_struct', ELLSWIFT: 'yes' }
- env_vars: { WIDEMUL: 'int128', RECOVERY: 'yes', SCHNORRSIG: 'yes', ELLSWIFT: 'yes' } - env_vars: { WIDEMUL: 'int128', RECOVERY: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', ELLSWIFT: 'yes' }
- env_vars: { WIDEMUL: 'int128', ECDH: 'yes', SCHNORRSIG: 'yes' } - env_vars: { WIDEMUL: 'int128', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes' }
- env_vars: { WIDEMUL: 'int128', ASM: 'x86_64', ELLSWIFT: 'yes' } - env_vars: { WIDEMUL: 'int128', ASM: 'x86_64', ELLSWIFT: 'yes' }
- env_vars: { RECOVERY: 'yes', SCHNORRSIG: 'yes' } - env_vars: { RECOVERY: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes' }
- env_vars: { CTIMETESTS: 'no', RECOVERY: 'yes', ECDH: 'yes', SCHNORRSIG: 'yes', CPPFLAGS: '-DVERIFY' } - env_vars: { CTIMETESTS: 'no', RECOVERY: 'yes', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', CPPFLAGS: '-DVERIFY' }
- env_vars: { BUILD: 'distcheck', WITH_VALGRIND: 'no', CTIMETESTS: 'no', BENCH: 'no' } - env_vars: { BUILD: 'distcheck', WITH_VALGRIND: 'no', CTIMETESTS: 'no', BENCH: 'no' }
- env_vars: { CPPFLAGS: '-DDETERMINISTIC' } - env_vars: { CPPFLAGS: '-DDETERMINISTIC' }
- env_vars: { CFLAGS: '-O0', CTIMETESTS: 'no' } - env_vars: { CFLAGS: '-O0', CTIMETESTS: 'no' }
- env_vars: { CFLAGS: '-O1', RECOVERY: 'yes', ECDH: 'yes', SCHNORRSIG: 'yes', ELLSWIFT: 'yes' } - env_vars: { CFLAGS: '-O1', RECOVERY: 'yes', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', ELLSWIFT: 'yes' }
- env_vars: { ECMULTGENKB: 2, ECMULTWINDOW: 2 } - env_vars: { ECMULTGENKB: 2, ECMULTWINDOW: 2 }
- env_vars: { ECMULTGENKB: 86, ECMULTWINDOW: 4 } - env_vars: { ECMULTGENKB: 86, ECMULTWINDOW: 4 }
cc: cc:
@@ -139,6 +140,7 @@ jobs:
HOST: 'i686-linux-gnu' HOST: 'i686-linux-gnu'
ECDH: 'yes' ECDH: 'yes'
RECOVERY: 'yes' RECOVERY: 'yes'
EXTRAKEYS: 'yes'
SCHNORRSIG: 'yes' SCHNORRSIG: 'yes'
ELLSWIFT: 'yes' ELLSWIFT: 'yes'
CC: ${{ matrix.cc }} CC: ${{ matrix.cc }}
@@ -183,6 +185,7 @@ jobs:
WITH_VALGRIND: 'no' WITH_VALGRIND: 'no'
ECDH: 'yes' ECDH: 'yes'
RECOVERY: 'yes' RECOVERY: 'yes'
EXTRAKEYS: 'yes'
SCHNORRSIG: 'yes' SCHNORRSIG: 'yes'
ELLSWIFT: 'yes' ELLSWIFT: 'yes'
CTIMETESTS: 'no' CTIMETESTS: 'no'
@@ -234,6 +237,7 @@ jobs:
WITH_VALGRIND: 'no' WITH_VALGRIND: 'no'
ECDH: 'yes' ECDH: 'yes'
RECOVERY: 'yes' RECOVERY: 'yes'
EXTRAKEYS: 'yes'
SCHNORRSIG: 'yes' SCHNORRSIG: 'yes'
ELLSWIFT: 'yes' ELLSWIFT: 'yes'
CTIMETESTS: 'no' CTIMETESTS: 'no'
@@ -279,6 +283,7 @@ jobs:
WITH_VALGRIND: 'no' WITH_VALGRIND: 'no'
ECDH: 'yes' ECDH: 'yes'
RECOVERY: 'yes' RECOVERY: 'yes'
EXTRAKEYS: 'yes'
SCHNORRSIG: 'yes' SCHNORRSIG: 'yes'
ELLSWIFT: 'yes' ELLSWIFT: 'yes'
CTIMETESTS: 'no' CTIMETESTS: 'no'
@@ -334,6 +339,7 @@ jobs:
WITH_VALGRIND: 'no' WITH_VALGRIND: 'no'
ECDH: 'yes' ECDH: 'yes'
RECOVERY: 'yes' RECOVERY: 'yes'
EXTRAKEYS: 'yes'
SCHNORRSIG: 'yes' SCHNORRSIG: 'yes'
ELLSWIFT: 'yes' ELLSWIFT: 'yes'
CTIMETESTS: 'no' CTIMETESTS: 'no'
@@ -386,6 +392,7 @@ jobs:
WRAPPER_CMD: 'valgrind --error-exitcode=42' WRAPPER_CMD: 'valgrind --error-exitcode=42'
ECDH: 'yes' ECDH: 'yes'
RECOVERY: 'yes' RECOVERY: 'yes'
EXTRAKEYS: 'yes'
SCHNORRSIG: 'yes' SCHNORRSIG: 'yes'
ELLSWIFT: 'yes' ELLSWIFT: 'yes'
CTIMETESTS: 'no' CTIMETESTS: 'no'
@@ -437,6 +444,7 @@ jobs:
env: env:
ECDH: 'yes' ECDH: 'yes'
RECOVERY: 'yes' RECOVERY: 'yes'
EXTRAKEYS: 'yes'
SCHNORRSIG: 'yes' SCHNORRSIG: 'yes'
ELLSWIFT: 'yes' ELLSWIFT: 'yes'
CTIMETESTS: 'no' CTIMETESTS: 'no'
@@ -501,6 +509,7 @@ jobs:
env: env:
ECDH: 'yes' ECDH: 'yes'
RECOVERY: 'yes' RECOVERY: 'yes'
EXTRAKEYS: 'yes'
SCHNORRSIG: 'yes' SCHNORRSIG: 'yes'
ELLSWIFT: 'yes' ELLSWIFT: 'yes'
CC: 'clang' CC: 'clang'
@@ -547,6 +556,7 @@ jobs:
WITH_VALGRIND: 'no' WITH_VALGRIND: 'no'
ECDH: 'yes' ECDH: 'yes'
RECOVERY: 'yes' RECOVERY: 'yes'
EXTRAKEYS: 'yes'
SCHNORRSIG: 'yes' SCHNORRSIG: 'yes'
ELLSWIFT: 'yes' ELLSWIFT: 'yes'
CTIMETESTS: 'no' CTIMETESTS: 'no'
@@ -605,15 +615,15 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
env_vars: env_vars:
- { WIDEMUL: 'int64', RECOVERY: 'yes', ECDH: 'yes', SCHNORRSIG: 'yes', ELLSWIFT: 'yes' } - { WIDEMUL: 'int64', RECOVERY: 'yes', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', ELLSWIFT: 'yes' }
- { WIDEMUL: 'int128_struct', ECMULTGENKB: 2, ECMULTWINDOW: 4 } - { WIDEMUL: 'int128_struct', ECMULTGENKB: 2, ECMULTWINDOW: 4 }
- { WIDEMUL: 'int128', ECDH: 'yes', SCHNORRSIG: 'yes', ELLSWIFT: 'yes' } - { WIDEMUL: 'int128', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', ELLSWIFT: 'yes' }
- { WIDEMUL: 'int128', RECOVERY: 'yes' } - { WIDEMUL: 'int128', RECOVERY: 'yes' }
- { WIDEMUL: 'int128', RECOVERY: 'yes', ECDH: 'yes', SCHNORRSIG: 'yes', ELLSWIFT: 'yes' } - { WIDEMUL: 'int128', RECOVERY: 'yes', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', ELLSWIFT: 'yes' }
- { WIDEMUL: 'int128', RECOVERY: 'yes', ECDH: 'yes', SCHNORRSIG: 'yes', ELLSWIFT: 'yes', CC: 'gcc' } - { WIDEMUL: 'int128', RECOVERY: 'yes', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', ELLSWIFT: 'yes', CC: 'gcc' }
- { WIDEMUL: 'int128', RECOVERY: 'yes', ECDH: 'yes', SCHNORRSIG: 'yes', ELLSWIFT: 'yes', WRAPPER_CMD: 'valgrind --error-exitcode=42', SECP256K1_TEST_ITERS: 2 } - { WIDEMUL: 'int128', RECOVERY: 'yes', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', ELLSWIFT: 'yes', WRAPPER_CMD: 'valgrind --error-exitcode=42', SECP256K1_TEST_ITERS: 2 }
- { WIDEMUL: 'int128', RECOVERY: 'yes', ECDH: 'yes', SCHNORRSIG: 'yes', ELLSWIFT: 'yes', CC: 'gcc', WRAPPER_CMD: 'valgrind --error-exitcode=42', SECP256K1_TEST_ITERS: 2 } - { WIDEMUL: 'int128', RECOVERY: 'yes', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', ELLSWIFT: 'yes', CC: 'gcc', WRAPPER_CMD: 'valgrind --error-exitcode=42', SECP256K1_TEST_ITERS: 2 }
- { WIDEMUL: 'int128', RECOVERY: 'yes', ECDH: 'yes', SCHNORRSIG: 'yes', ELLSWIFT: 'yes', CPPFLAGS: '-DVERIFY', CTIMETESTS: 'no' } - { WIDEMUL: 'int128', RECOVERY: 'yes', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', ELLSWIFT: 'yes', CPPFLAGS: '-DVERIFY', CTIMETESTS: 'no' }
- BUILD: 'distcheck' - BUILD: 'distcheck'
steps: steps:
@@ -666,13 +676,13 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
env_vars: env_vars:
- { WIDEMUL: 'int64', RECOVERY: 'yes', ECDH: 'yes', SCHNORRSIG: 'yes', ELLSWIFT: 'yes' } - { WIDEMUL: 'int64', RECOVERY: 'yes', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', ELLSWIFT: 'yes' }
- { WIDEMUL: 'int128_struct', ECMULTGENPRECISION: 2, ECMULTWINDOW: 4 } - { WIDEMUL: 'int128_struct', ECMULTGENPRECISION: 2, ECMULTWINDOW: 4 }
- { WIDEMUL: 'int128', ECDH: 'yes', SCHNORRSIG: 'yes', ELLSWIFT: 'yes' } - { WIDEMUL: 'int128', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', ELLSWIFT: 'yes' }
- { WIDEMUL: 'int128', RECOVERY: 'yes' } - { WIDEMUL: 'int128', RECOVERY: 'yes' }
- { WIDEMUL: 'int128', RECOVERY: 'yes', ECDH: 'yes', SCHNORRSIG: 'yes', ELLSWIFT: 'yes' } - { WIDEMUL: 'int128', RECOVERY: 'yes', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', ELLSWIFT: 'yes' }
- { WIDEMUL: 'int128', RECOVERY: 'yes', ECDH: 'yes', SCHNORRSIG: 'yes', ELLSWIFT: 'yes', CC: 'gcc' } - { WIDEMUL: 'int128', RECOVERY: 'yes', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', ELLSWIFT: 'yes', CC: 'gcc' }
- { WIDEMUL: 'int128', RECOVERY: 'yes', ECDH: 'yes', SCHNORRSIG: 'yes', ELLSWIFT: 'yes', CPPFLAGS: '-DVERIFY' } - { WIDEMUL: 'int128', RECOVERY: 'yes', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', ELLSWIFT: 'yes', CPPFLAGS: '-DVERIFY' }
- BUILD: 'distcheck' - BUILD: 'distcheck'
steps: steps:
@@ -778,6 +788,7 @@ jobs:
WERROR_CFLAGS: WERROR_CFLAGS:
ECDH: 'yes' ECDH: 'yes'
RECOVERY: 'yes' RECOVERY: 'yes'
EXTRAKEYS: 'yes'
SCHNORRSIG: 'yes' SCHNORRSIG: 'yes'
ELLSWIFT: 'yes' ELLSWIFT: 'yes'

3
ci/ci.sh
View File

@@ -13,7 +13,7 @@ print_environment() {
# does not rely on bash. # does not rely on bash.
for var in WERROR_CFLAGS MAKEFLAGS BUILD \ for var in WERROR_CFLAGS MAKEFLAGS BUILD \
ECMULTWINDOW ECMULTGENKB ASM WIDEMUL WITH_VALGRIND EXTRAFLAGS \ ECMULTWINDOW ECMULTGENKB ASM WIDEMUL WITH_VALGRIND EXTRAFLAGS \
EXPERIMENTAL ECDH RECOVERY SCHNORRSIG ELLSWIFT \ EXPERIMENTAL ECDH RECOVERY EXTRAKEYS SCHNORRSIG ELLSWIFT \
SECP256K1_TEST_ITERS BENCH SECP256K1_BENCH_ITERS CTIMETESTS\ SECP256K1_TEST_ITERS BENCH SECP256K1_BENCH_ITERS CTIMETESTS\
EXAMPLES \ EXAMPLES \
HOST WRAPPER_CMD \ HOST WRAPPER_CMD \
@@ -77,6 +77,7 @@ esac
--with-ecmult-gen-kb="$ECMULTGENKB" \ --with-ecmult-gen-kb="$ECMULTGENKB" \
--enable-module-ecdh="$ECDH" --enable-module-recovery="$RECOVERY" \ --enable-module-ecdh="$ECDH" --enable-module-recovery="$RECOVERY" \
--enable-module-ellswift="$ELLSWIFT" \ --enable-module-ellswift="$ELLSWIFT" \
--enable-module-extrakeys="$EXTRAKEYS" \
--enable-module-schnorrsig="$SCHNORRSIG" \ --enable-module-schnorrsig="$SCHNORRSIG" \
--enable-examples="$EXAMPLES" \ --enable-examples="$EXAMPLES" \
--enable-ctime-tests="$CTIMETESTS" \ --enable-ctime-tests="$CTIMETESTS" \