Skip to content

Commit e1d15fd

Browse files
b-wagnb-wagn
committed
correct order for modules
1 parent 2ed3978 commit e1d15fd

File tree

4 files changed

+44
-44
lines changed

4 files changed

+44
-44
lines changed

‎.github/workflows/ci.yml

+22-22
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ env:
3232
ECDH: 'no'
3333
RECOVERY: 'no'
3434
SCHNORRSIG: 'no'
35-
SCHNORRSIG_HALFAGG: 'no'
3635
ELLSWIFT: 'no'
3736
ECDSA_S2C: 'no'
3837
GENERATOR: 'no'
@@ -41,6 +40,7 @@ env:
4140
MUSIG: 'no'
4241
ECDSAADAPTOR: 'no'
4342
BPPP: 'no'
43+
SCHNORRSIG_HALFAGG: 'no'
4444
### test options
4545
SECP256K1_TEST_ITERS:
4646
BENCH: 'yes'
@@ -79,14 +79,14 @@ jobs:
7979
matrix:
8080
configuration:
8181
- env_vars: { WIDEMUL: 'int64', RECOVERY: 'yes' }
82-
- env_vars: { WIDEMUL: 'int64', ECDH: 'yes', SCHNORRSIG: 'yes', SCHNORRSIG_HALFAGG: 'yes', ELLSWIFT: 'yes', EXPERIMENTAL: 'yes', ECDSA_S2C: 'yes', RANGEPROOF: 'yes', WHITELIST: 'yes', GENERATOR: 'yes', MUSIG: 'yes', ECDSAADAPTOR: 'yes', BPPP: 'yes' }
82+
- env_vars: { WIDEMUL: 'int64', ECDH: 'yes', SCHNORRSIG: 'yes', ELLSWIFT: 'yes', EXPERIMENTAL: 'yes', ECDSA_S2C: 'yes', RANGEPROOF: 'yes', WHITELIST: 'yes', GENERATOR: 'yes', MUSIG: 'yes', ECDSAADAPTOR: 'yes', BPPP: 'yes', SCHNORRSIG_HALFAGG: 'yes'}
8383
- env_vars: { WIDEMUL: 'int128' }
8484
- env_vars: { WIDEMUL: 'int128_struct', ELLSWIFT: 'yes' }
8585
- env_vars: { WIDEMUL: 'int128', RECOVERY: 'yes', SCHNORRSIG: 'yes', ELLSWIFT: 'yes' }
86-
- env_vars: { WIDEMUL: 'int128', ECDH: 'yes', SCHNORRSIG: 'yes', SCHNORRSIG_HALFAGG: 'yes', EXPERIMENTAL: 'yes', ECDSA_S2C: 'yes', RANGEPROOF: 'yes', WHITELIST: 'yes', GENERATOR: 'yes', MUSIG: 'yes', ECDSAADAPTOR: 'yes', BPPP: 'yes'}
86+
- env_vars: { WIDEMUL: 'int128', ECDH: 'yes', SCHNORRSIG: 'yes', EXPERIMENTAL: 'yes', ECDSA_S2C: 'yes', RANGEPROOF: 'yes', WHITELIST: 'yes', GENERATOR: 'yes', MUSIG: 'yes', ECDSAADAPTOR: 'yes', BPPP: 'yes', SCHNORRSIG_HALFAGG: 'yes'}
8787
- env_vars: { WIDEMUL: 'int128', ASM: 'x86_64', ELLSWIFT: 'yes' }
88-
- env_vars: { RECOVERY: 'yes', SCHNORRSIG: 'yes', SCHNORRSIG_HALFAGG: 'yes', EXPERIMENTAL: 'yes', ECDSA_S2C: 'yes', RANGEPROOF: 'yes', WHITELIST: 'yes', GENERATOR: 'yes', MUSIG: 'yes', ECDSAADAPTOR: 'yes', BPPP: 'yes'}
89-
- env_vars: { CTIMETESTS: 'no', RECOVERY: 'yes', ECDH: 'yes', SCHNORRSIG: 'yes', SCHNORRSIG_HALFAGG: 'yes', EXPERIMENTAL: 'yes', ECDSA_S2C: 'yes', RANGEPROOF: 'yes', WHITELIST: 'yes', GENERATOR: 'yes', MUSIG: 'yes', ECDSAADAPTOR: 'yes', BPPP: 'yes', CPPFLAGS: '-DVERIFY' }
88+
- env_vars: { RECOVERY: 'yes', SCHNORRSIG: 'yes', EXPERIMENTAL: 'yes', ECDSA_S2C: 'yes', RANGEPROOF: 'yes', WHITELIST: 'yes', GENERATOR: 'yes', MUSIG: 'yes', ECDSAADAPTOR: 'yes', BPPP: 'yes', SCHNORRSIG_HALFAGG: 'yes'}
89+
- env_vars: { CTIMETESTS: 'no', RECOVERY: 'yes', ECDH: 'yes', SCHNORRSIG: 'yes', EXPERIMENTAL: 'yes', ECDSA_S2C: 'yes', RANGEPROOF: 'yes', WHITELIST: 'yes', GENERATOR: 'yes', MUSIG: 'yes', ECDSAADAPTOR: 'yes', BPPP: 'yes', SCHNORRSIG_HALFAGG: 'yes', CPPFLAGS: '-DVERIFY' }
9090
- env_vars: { BUILD: 'distcheck', WITH_VALGRIND: 'no', CTIMETESTS: 'no', BENCH: 'no' }
9191
- env_vars: { CPPFLAGS: '-DDETERMINISTIC' }
9292
- env_vars: { CFLAGS: '-O0', CTIMETESTS: 'no' }
@@ -148,7 +148,6 @@ jobs:
148148
ECDH: 'yes'
149149
RECOVERY: 'yes'
150150
SCHNORRSIG: 'yes'
151-
SCHNORRSIG_HALFAGG: 'yes'
152151
ELLSWIFT: 'yes'
153152
EXPERIMENTAL: 'yes'
154153
ECDSA_S2C: 'yes'
@@ -158,6 +157,7 @@ jobs:
158157
MUSIG: 'yes'
159158
ECDSAADAPTOR: 'yes'
160159
BPPP: 'yes'
160+
SCHNORRSIG_HALFAGG: 'yes'
161161
CC: ${{ matrix.cc }}
162162

163163
steps:
@@ -201,7 +201,6 @@ jobs:
201201
ECDH: 'yes'
202202
RECOVERY: 'yes'
203203
SCHNORRSIG: 'yes'
204-
SCHNORRSIG_HALFAGG: 'yes'
205204
ELLSWIFT: 'yes'
206205
EXPERIMENTAL: 'yes'
207206
ECDSA_S2C: 'yes'
@@ -211,6 +210,7 @@ jobs:
211210
MUSIG: 'yes'
212211
ECDSAADAPTOR: 'yes'
213212
BPPP: 'yes'
213+
SCHNORRSIG_HALFAGG: 'yes'
214214
CTIMETESTS: 'no'
215215

216216
steps:
@@ -261,7 +261,6 @@ jobs:
261261
ECDH: 'yes'
262262
RECOVERY: 'yes'
263263
SCHNORRSIG: 'yes'
264-
SCHNORRSIG_HALFAGG: 'yes'
265264
ELLSWIFT: 'yes'
266265
EXPERIMENTAL: 'yes'
267266
ECDSA_S2C: 'yes'
@@ -271,6 +270,7 @@ jobs:
271270
MUSIG: 'yes'
272271
ECDSAADAPTOR: 'yes'
273272
BPPP: 'yes'
273+
SCHNORRSIG_HALFAGG: 'yes'
274274
CTIMETESTS: 'no'
275275

276276
steps:
@@ -315,7 +315,6 @@ jobs:
315315
ECDH: 'yes'
316316
RECOVERY: 'yes'
317317
SCHNORRSIG: 'yes'
318-
SCHNORRSIG_HALFAGG: 'yes'
319318
ELLSWIFT: 'yes'
320319
EXPERIMENTAL: 'yes'
321320
ECDSA_S2C: 'yes'
@@ -325,6 +324,7 @@ jobs:
325324
MUSIG: 'yes'
326325
ECDSAADAPTOR: 'yes'
327326
BPPP: 'yes'
327+
SCHNORRSIG_HALFAGG: 'yes'
328328
CTIMETESTS: 'no'
329329

330330
strategy:
@@ -379,7 +379,6 @@ jobs:
379379
ECDH: 'yes'
380380
RECOVERY: 'yes'
381381
SCHNORRSIG: 'yes'
382-
SCHNORRSIG_HALFAGG: 'yes'
383382
ELLSWIFT: 'yes'
384383
EXPERIMENTAL: 'yes'
385384
ECDSA_S2C: 'yes'
@@ -389,6 +388,7 @@ jobs:
389388
MUSIG: 'yes'
390389
ECDSAADAPTOR: 'yes'
391390
BPPP: 'yes'
391+
SCHNORRSIG_HALFAGG: 'yes'
392392
CTIMETESTS: 'no'
393393

394394
steps:
@@ -440,7 +440,6 @@ jobs:
440440
ECDH: 'yes'
441441
RECOVERY: 'yes'
442442
SCHNORRSIG: 'yes'
443-
SCHNORRSIG_HALFAGG: 'yes'
444443
ELLSWIFT: 'yes'
445444
EXPERIMENTAL: 'yes'
446445
ECDSA_S2C: 'yes'
@@ -450,6 +449,7 @@ jobs:
450449
MUSIG: 'yes'
451450
ECDSAADAPTOR: 'yes'
452451
BPPP: 'yes'
452+
SCHNORRSIG_HALFAGG: 'yes'
453453
CTIMETESTS: 'no'
454454
SECP256K1_TEST_ITERS: 2
455455

@@ -500,7 +500,6 @@ jobs:
500500
ECDH: 'yes'
501501
RECOVERY: 'yes'
502502
SCHNORRSIG: 'yes'
503-
SCHNORRSIG_HALFAGG: 'yes'
504503
ELLSWIFT: 'yes'
505504
EXPERIMENTAL: 'yes'
506505
ECDSA_S2C: 'yes'
@@ -510,6 +509,7 @@ jobs:
510509
MUSIG: 'yes'
511510
ECDSAADAPTOR: 'yes'
512511
BPPP: 'yes'
512+
SCHNORRSIG_HALFAGG: 'yes'
513513
CTIMETESTS: 'no'
514514
CFLAGS: '-fsanitize=undefined,address -g'
515515
UBSAN_OPTIONS: 'print_stacktrace=1:halt_on_error=1'
@@ -566,7 +566,6 @@ jobs:
566566
ECDH: 'yes'
567567
RECOVERY: 'yes'
568568
SCHNORRSIG: 'yes'
569-
SCHNORRSIG_HALFAGG: 'yes'
570569
ELLSWIFT: 'yes'
571570
EXPERIMENTAL: 'yes'
572571
ECDSA_S2C: 'yes'
@@ -576,6 +575,7 @@ jobs:
576575
MUSIG: 'yes'
577576
ECDSAADAPTOR: 'yes'
578577
BPPP: 'yes'
578+
SCHNORRSIG_HALFAGG: 'yes'
579579
CTIMETESTS: 'yes'
580580
CC: 'clang'
581581
SECP256K1_TEST_ITERS: 32
@@ -622,7 +622,6 @@ jobs:
622622
ECDH: 'yes'
623623
RECOVERY: 'yes'
624624
SCHNORRSIG: 'yes'
625-
SCHNORRSIG_HALFAGG: 'yes'
626625
ELLSWIFT: 'yes'
627626
EXPERIMENTAL: 'yes'
628627
ECDSA_S2C: 'yes'
@@ -632,6 +631,7 @@ jobs:
632631
MUSIG: 'yes'
633632
ECDSAADAPTOR: 'yes'
634633
BPPP: 'yes'
634+
SCHNORRSIG_HALFAGG: 'yes'
635635
CTIMETESTS: 'no'
636636

637637
strategy:
@@ -688,15 +688,15 @@ jobs:
688688
fail-fast: false
689689
matrix:
690690
env_vars:
691-
- { WIDEMUL: 'int64', RECOVERY: 'yes', ECDH: 'yes', SCHNORRSIG: 'yes', SCHNORRSIG_HALFAGG: 'yes', ELLSWIFT: 'yes', EXPERIMENTAL: 'yes', ECDSA_S2C: 'yes', RANGEPROOF: 'yes', WHITELIST: 'yes', GENERATOR: 'yes', MUSIG: 'yes', ECDSAADAPTOR: 'yes', BPPP: 'yes' }
691+
- { WIDEMUL: 'int64', RECOVERY: 'yes', ECDH: 'yes', SCHNORRSIG: 'yes', ELLSWIFT: 'yes', EXPERIMENTAL: 'yes', ECDSA_S2C: 'yes', RANGEPROOF: 'yes', WHITELIST: 'yes', GENERATOR: 'yes', MUSIG: 'yes', ECDSAADAPTOR: 'yes', BPPP: 'yes', SCHNORRSIG_HALFAGG: 'yes' }
692692
- { WIDEMUL: 'int128_struct', ECMULTGENPRECISION: 2, ECMULTWINDOW: 4 }
693-
- { WIDEMUL: 'int128', ECDH: 'yes', SCHNORRSIG: 'yes', SCHNORRSIG_HALFAGG: 'yes', ELLSWIFT: 'yes', EXPERIMENTAL: 'yes', ECDSA_S2C: 'yes', RANGEPROOF: 'yes', WHITELIST: 'yes', GENERATOR: 'yes', MUSIG: 'yes', ECDSAADAPTOR: 'yes', BPPP: 'yes' }
693+
- { WIDEMUL: 'int128', ECDH: 'yes', SCHNORRSIG: 'yes', ELLSWIFT: 'yes', EXPERIMENTAL: 'yes', ECDSA_S2C: 'yes', RANGEPROOF: 'yes', WHITELIST: 'yes', GENERATOR: 'yes', MUSIG: 'yes', ECDSAADAPTOR: 'yes', BPPP: 'yes', SCHNORRSIG_HALFAGG: 'yes' }
694694
- { WIDEMUL: 'int128', RECOVERY: 'yes' }
695-
- { WIDEMUL: 'int128', RECOVERY: 'yes', ECDH: 'yes', SCHNORRSIG: 'yes', SCHNORRSIG_HALFAGG: 'yes', ELLSWIFT: 'yes', EXPERIMENTAL: 'yes', ECDSA_S2C: 'yes', RANGEPROOF: 'yes', WHITELIST: 'yes', GENERATOR: 'yes', MUSIG: 'yes', ECDSAADAPTOR: 'yes', BPPP: 'yes' }
696-
- { WIDEMUL: 'int128', RECOVERY: 'yes', ECDH: 'yes', SCHNORRSIG: 'yes', SCHNORRSIG_HALFAGG: 'yes', ELLSWIFT: 'yes', EXPERIMENTAL: 'yes', ECDSA_S2C: 'yes', RANGEPROOF: 'yes', WHITELIST: 'yes', GENERATOR: 'yes', MUSIG: 'yes', ECDSAADAPTOR: 'yes', BPPP: 'yes', CC: 'gcc' }
697-
- { WIDEMUL: 'int128', RECOVERY: 'yes', ECDH: 'yes', SCHNORRSIG: 'yes', SCHNORRSIG_HALFAGG: 'yes', ELLSWIFT: 'yes', EXPERIMENTAL: 'yes', ECDSA_S2C: 'yes', RANGEPROOF: 'yes', WHITELIST: 'yes', GENERATOR: 'yes', MUSIG: 'yes', ECDSAADAPTOR: 'yes', BPPP: 'yes', WRAPPER_CMD: 'valgrind --error-exitcode=42', SECP256K1_TEST_ITERS: 2 }
698-
- { WIDEMUL: 'int128', RECOVERY: 'yes', ECDH: 'yes', SCHNORRSIG: 'yes', SCHNORRSIG_HALFAGG: 'yes', ELLSWIFT: 'yes', EXPERIMENTAL: 'yes', ECDSA_S2C: 'yes', RANGEPROOF: 'yes', WHITELIST: 'yes', GENERATOR: 'yes', MUSIG: 'yes', ECDSAADAPTOR: 'yes', BPPP: 'yes', CC: 'gcc', WRAPPER_CMD: 'valgrind --error-exitcode=42', SECP256K1_TEST_ITERS: 2 }
699-
- { WIDEMUL: 'int128', RECOVERY: 'yes', ECDH: 'yes', SCHNORRSIG: 'yes', SCHNORRSIG_HALFAGG: 'yes', ELLSWIFT: 'yes', EXPERIMENTAL: 'yes', ECDSA_S2C: 'yes', RANGEPROOF: 'yes', WHITELIST: 'yes', GENERATOR: 'yes', MUSIG: 'yes', ECDSAADAPTOR: 'yes', BPPP: 'yes', CPPFLAGS: '-DVERIFY', CTIMETESTS: 'no' }
695+
- { WIDEMUL: 'int128', RECOVERY: 'yes', ECDH: 'yes', SCHNORRSIG: 'yes', ELLSWIFT: 'yes', EXPERIMENTAL: 'yes', ECDSA_S2C: 'yes', RANGEPROOF: 'yes', WHITELIST: 'yes', GENERATOR: 'yes', MUSIG: 'yes', ECDSAADAPTOR: 'yes', BPPP: 'yes', SCHNORRSIG_HALFAGG: 'yes' }
696+
- { WIDEMUL: 'int128', RECOVERY: 'yes', ECDH: 'yes', SCHNORRSIG: 'yes', ELLSWIFT: 'yes', EXPERIMENTAL: 'yes', ECDSA_S2C: 'yes', RANGEPROOF: 'yes', WHITELIST: 'yes', GENERATOR: 'yes', MUSIG: 'yes', ECDSAADAPTOR: 'yes', BPPP: 'yes', SCHNORRSIG_HALFAGG: 'yes', CC: 'gcc' }
697+
- { WIDEMUL: 'int128', RECOVERY: 'yes', ECDH: 'yes', SCHNORRSIG: 'yes', ELLSWIFT: 'yes', EXPERIMENTAL: 'yes', ECDSA_S2C: 'yes', RANGEPROOF: 'yes', WHITELIST: 'yes', GENERATOR: 'yes', MUSIG: 'yes', ECDSAADAPTOR: 'yes', BPPP: 'yes', SCHNORRSIG_HALFAGG: 'yes', WRAPPER_CMD: 'valgrind --error-exitcode=42', SECP256K1_TEST_ITERS: 2 }
698+
- { WIDEMUL: 'int128', RECOVERY: 'yes', ECDH: 'yes', SCHNORRSIG: 'yes', ELLSWIFT: 'yes', EXPERIMENTAL: 'yes', ECDSA_S2C: 'yes', RANGEPROOF: 'yes', WHITELIST: 'yes', GENERATOR: 'yes', MUSIG: 'yes', ECDSAADAPTOR: 'yes', BPPP: 'yes', SCHNORRSIG_HALFAGG: 'yes', CC: 'gcc', WRAPPER_CMD: 'valgrind --error-exitcode=42', SECP256K1_TEST_ITERS: 2 }
699+
- { WIDEMUL: 'int128', RECOVERY: 'yes', ECDH: 'yes', SCHNORRSIG: 'yes', ELLSWIFT: 'yes', EXPERIMENTAL: 'yes', ECDSA_S2C: 'yes', RANGEPROOF: 'yes', WHITELIST: 'yes', GENERATOR: 'yes', MUSIG: 'yes', ECDSAADAPTOR: 'yes', BPPP: 'yes', SCHNORRSIG_HALFAGG: 'yes', CPPFLAGS: '-DVERIFY', CTIMETESTS: 'no' }
700700
- BUILD: 'distcheck'
701701

702702
steps:
@@ -806,7 +806,6 @@ jobs:
806806
ECDH: 'yes'
807807
RECOVERY: 'yes'
808808
SCHNORRSIG: 'yes'
809-
SCHNORRSIG_HALFAGG: 'yes'
810809
ELLSWIFT: 'yes'
811810
EXPERIMENTAL: 'yes'
812811
ECDSA_S2C: 'yes'
@@ -816,6 +815,7 @@ jobs:
816815
MUSIG: 'yes'
817816
ECDSAADAPTOR: 'yes'
818817
BPPP: 'yes'
818+
SCHNORRSIG_HALFAGG: 'yes'
819819

820820
steps:
821821
- name: Checkout

‎Makefile.am

+4-4
Original file line numberDiff line numberDiff line change
@@ -265,6 +265,10 @@ EXTRA_DIST += src/wycheproof/WYCHEPROOF_COPYING
265265
EXTRA_DIST += src/wycheproof/ecdsa_secp256k1_sha256_bitcoin_test.json
266266
EXTRA_DIST += tools/tests_wycheproof_generate.py
267267

268+
if ENABLE_MODULE_SCHNORRSIG_HALFAGG
269+
include src/modules/schnorrsig_halfagg/Makefile.am.include
270+
endif
271+
268272
if ENABLE_MODULE_BPPP
269273
include src/modules/bppp/Makefile.am.include
270274
endif
@@ -305,10 +309,6 @@ if ENABLE_MODULE_SCHNORRSIG
305309
include src/modules/schnorrsig/Makefile.am.include
306310
endif
307311

308-
if ENABLE_MODULE_SCHNORRSIG_HALFAGG
309-
include src/modules/schnorrsig_halfagg/Makefile.am.include
310-
endif
311-
312312
if ENABLE_MODULE_ELLSWIFT
313313
include src/modules/ellswift/Makefile.am.include
314314
endif

‎configure.ac

+10-10
Original file line numberDiff line numberDiff line change
@@ -449,6 +449,11 @@ SECP_CFLAGS="$SECP_CFLAGS $WERROR_CFLAGS"
449449

450450
# Processing must be done in a reverse topological sorting of the dependency graph
451451
# (dependent module first).
452+
if test x"$enable_module_schnorrsig_halfagg" = x"yes"; then
453+
SECP_CONFIG_DEFINES="$SECP_CONFIG_DEFINES -DENABLE_MODULE_SCHNORRSIG_HALFAGG=1"
454+
enable_module_schnorrsig=yes
455+
fi
456+
452457
if test x"$enable_module_bppp" = x"yes"; then
453458
if test x"$enable_module_generator" = x"no"; then
454459
AC_MSG_ERROR([Module dependency error: You have disabled the generator module explicitly, but it is required by the bppp module.])
@@ -505,11 +510,6 @@ if test x"$enable_module_ellswift" = x"yes"; then
505510
SECP_CONFIG_DEFINES="$SECP_CONFIG_DEFINES -DENABLE_MODULE_ELLSWIFT=1"
506511
fi
507512

508-
if test x"$enable_module_schnorrsig_halfagg" = x"yes"; then
509-
SECP_CONFIG_DEFINES="$SECP_CONFIG_DEFINES -DENABLE_MODULE_SCHNORRSIG_HALFAGG=1"
510-
enable_module_schnorrsig=yes
511-
fi
512-
513513
if test x"$enable_module_schnorrsig" = x"yes"; then
514514
if test x"$enable_module_extrakeys" = x"no"; then
515515
AC_MSG_ERROR([Module dependency error: You have disabled the extrakeys module explicitly, but it is required by the schnorrsig module.])
@@ -552,15 +552,15 @@ else
552552
# module (which automatically enables the module dependencies) we want to
553553
# print an error for the dependent module, not the module dependency. Hence,
554554
# we first test dependent modules.
555+
if test x"$enable_module_schnorrsig_halfagg" = x"yes"; then
556+
AC_MSG_ERROR([Schnorrsig Half-Aggregation module is experimental. Use --enable-experimental to allow.])
557+
fi
555558
if test x"$enable_module_bppp" = x"yes"; then
556559
AC_MSG_ERROR([Bulletproofs++ module is experimental. Use --enable-experimental to allow.])
557560
fi
558561
if test x"$enable_module_ecdsa_adaptor" = x"yes"; then
559562
AC_MSG_ERROR([ecdsa adaptor signatures module is experimental. Use --enable-experimental to allow.])
560563
fi
561-
if test x"$enable_module_schnorrsig_halfagg" = x"yes"; then
562-
AC_MSG_ERROR([Schnorrsig Half-Aggregation module is experimental. Use --enable-experimental to allow.])
563-
fi
564564
if test x"$enable_module_ecdsa_s2c" = x"yes"; then
565565
AC_MSG_ERROR([ECDSA sign-to-contract module module is experimental. Use --enable-experimental to allow.])
566566
fi
@@ -601,7 +601,6 @@ AM_CONDITIONAL([ENABLE_MODULE_ECDH], [test x"$enable_module_ecdh" = x"yes"])
601601
AM_CONDITIONAL([ENABLE_MODULE_RECOVERY], [test x"$enable_module_recovery" = x"yes"])
602602
AM_CONDITIONAL([ENABLE_MODULE_EXTRAKEYS], [test x"$enable_module_extrakeys" = x"yes"])
603603
AM_CONDITIONAL([ENABLE_MODULE_SCHNORRSIG], [test x"$enable_module_schnorrsig" = x"yes"])
604-
AM_CONDITIONAL([ENABLE_MODULE_SCHNORRSIG_HALFAGG], [test x"$enable_module_schnorrsig_halfagg" = x"yes"])
605604
AM_CONDITIONAL([ENABLE_MODULE_ELLSWIFT], [test x"$enable_module_ellswift" = x"yes"])
606605
AM_CONDITIONAL([ENABLE_MODULE_GENERATOR], [test x"$enable_module_generator" = x"yes"])
607606
AM_CONDITIONAL([ENABLE_MODULE_RANGEPROOF], [test x"$enable_module_rangeproof" = x"yes"])
@@ -611,6 +610,7 @@ AM_CONDITIONAL([ENABLE_MODULE_MUSIG], [test x"$enable_module_musig" = x"yes"])
611610
AM_CONDITIONAL([ENABLE_MODULE_ECDSA_S2C], [test x"$enable_module_ecdsa_s2c" = x"yes"])
612611
AM_CONDITIONAL([ENABLE_MODULE_ECDSA_ADAPTOR], [test x"$enable_module_ecdsa_adaptor" = x"yes"])
613612
AM_CONDITIONAL([ENABLE_MODULE_BPPP], [test x"$enable_module_bppp" = x"yes"])
613+
AM_CONDITIONAL([ENABLE_MODULE_SCHNORRSIG_HALFAGG], [test x"$enable_module_schnorrsig_halfagg" = x"yes"])
614614
AM_CONDITIONAL([USE_REDUCED_SURJECTION_PROOF_SIZE], [test x"$use_reduced_surjection_proof_size" = x"yes"])
615615
AM_CONDITIONAL([USE_EXTERNAL_ASM], [test x"$enable_external_asm" = x"yes"])
616616
AM_CONDITIONAL([USE_ASM_ARM], [test x"$set_asm" = x"arm32"])
@@ -637,7 +637,6 @@ echo " module ecdh = $enable_module_ecdh"
637637
echo " module recovery = $enable_module_recovery"
638638
echo " module extrakeys = $enable_module_extrakeys"
639639
echo " module schnorrsig = $enable_module_schnorrsig"
640-
echo " module schnorrsig-halfagg = $enable_module_schnorrsig_halfagg"
641640
echo " module ellswift = $enable_module_ellswift"
642641
# libsecp256k1-zkp modules, in the order they were added to the libsecp256k1-zkp
643642
echo " module generator = $enable_module_generator"
@@ -651,6 +650,7 @@ echo " module musig = $enable_module_musig"
651650
echo " module ecdsa-s2c = $enable_module_ecdsa_s2c"
652651
echo " module ecdsa-adaptor = $enable_module_ecdsa_adaptor"
653652
echo " module bppp = $enable_module_bppp"
653+
echo " module schnorrsig-halfagg = $enable_module_schnorrsig_halfagg"
654654
echo
655655
echo " asm = $set_asm"
656656
echo " ecmult window size = $set_ecmult_window"

‎src/tests.c

+8-8
Original file line numberDiff line numberDiff line change
@@ -7446,6 +7446,10 @@ static void run_ecdsa_wycheproof(void) {
74467446
test_ecdsa_wycheproof();
74477447
}
74487448

7449+
#ifdef ENABLE_MODULE_SCHNORRSIG_HALFAGG
7450+
# include "modules/schnorrsig_halfagg/tests_impl.h"
7451+
#endif
7452+
74497453
#ifdef ENABLE_MODULE_BPPP
74507454
# include "modules/bppp/tests_impl.h"
74517455
#endif
@@ -7486,10 +7490,6 @@ static void run_ecdsa_wycheproof(void) {
74867490
# include "modules/schnorrsig/tests_impl.h"
74877491
#endif
74887492

7489-
#ifdef ENABLE_MODULE_SCHNORRSIG_HALFAGG
7490-
# include "modules/schnorrsig_halfagg/tests_impl.h"
7491-
#endif
7492-
74937493
#ifdef ENABLE_MODULE_ELLSWIFT
74947494
# include "modules/ellswift/tests_impl.h"
74957495
#endif
@@ -7822,6 +7822,10 @@ int main(int argc, char **argv) {
78227822
/* EC key arithmetic test */
78237823
run_eckey_negate_test();
78247824

7825+
#ifdef ENABLE_MODULE_SCHNORRSIG_HALFAGG
7826+
run_schnorrsig_halfagg_tests();
7827+
#endif
7828+
78257829
#ifdef ENABLE_MODULE_BPPP
78267830
run_bppp_tests();
78277831
#endif
@@ -7875,10 +7879,6 @@ int main(int argc, char **argv) {
78757879
run_schnorrsig_tests();
78767880
#endif
78777881

7878-
#ifdef ENABLE_MODULE_SCHNORRSIG_HALFAGG
7879-
run_schnorrsig_halfagg_tests();
7880-
#endif
7881-
78827882
#ifdef ENABLE_MODULE_ELLSWIFT
78837883
run_ellswift_tests();
78847884
#endif

0 commit comments

Comments
 (0)