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

re-enable musig module

Browse Source
This commit is contained in:
Andrew Poelstra 2020-10-14 15:03:26 +00:00
parent 23900a0d86
commit 96b9236c42
3 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.am
View File

@ -151,9 +151,9 @@ if ENABLE_MODULE_ECDH
include src/modules/ecdh/Makefile.am.include include src/modules/ecdh/Makefile.am.include
endif endif
#if ENABLE_MODULE_MUSIG if ENABLE_MODULE_MUSIG
#include src/modules/musig/Makefile.am.include include src/modules/musig/Makefile.am.include
#endif endif
if ENABLE_MODULE_RECOVERY if ENABLE_MODULE_RECOVERY
include src/modules/recovery/Makefile.am.include include src/modules/recovery/Makefile.am.include

34
configure.ac
View File

@ -131,10 +131,10 @@ AC_ARG_ENABLE(module_ecdh,
[enable_module_ecdh=$enableval], [enable_module_ecdh=$enableval],
[enable_module_ecdh=no]) [enable_module_ecdh=no])
#AC_ARG_ENABLE(module_musig, AC_ARG_ENABLE(module_musig,
# AS_HELP_STRING([--enable-module-musig],[enable MuSig module (experimental)]), AS_HELP_STRING([--enable-module-musig],[enable MuSig module (experimental)]),
# [enable_module_musig=$enableval], [enable_module_musig=$enableval],
# [enable_module_musig=no]) [enable_module_musig=no])
AC_ARG_ENABLE(module_recovery, AC_ARG_ENABLE(module_recovery,
AS_HELP_STRING([--enable-module-recovery],[enable ECDSA pubkey recovery module [default=no]]), AS_HELP_STRING([--enable-module-recovery],[enable ECDSA pubkey recovery module [default=no]]),
@ -469,9 +469,9 @@ if test x"$enable_module_ecdh" = x"yes"; then
AC_DEFINE(ENABLE_MODULE_ECDH, 1, [Define this symbol to enable the ECDH module]) AC_DEFINE(ENABLE_MODULE_ECDH, 1, [Define this symbol to enable the ECDH module])
fi fi
#if test x"$enable_module_musig" = x"yes"; then if test x"$enable_module_musig" = x"yes"; then
# AC_DEFINE(ENABLE_MODULE_MUSIG, 1, [Define this symbol to enable the MuSig module]) AC_DEFINE(ENABLE_MODULE_MUSIG, 1, [Define this symbol to enable the MuSig module])
#fi fi
if test x"$enable_module_recovery" = x"yes"; then if test x"$enable_module_recovery" = x"yes"; then
AC_DEFINE(ENABLE_MODULE_RECOVERY, 1, [Define this symbol to enable the ECDSA pubkey recovery module]) AC_DEFINE(ENABLE_MODULE_RECOVERY, 1, [Define this symbol to enable the ECDSA pubkey recovery module])
@ -525,17 +525,17 @@ if test x"$enable_experimental" = x"yes"; then
AC_MSG_NOTICE([Building range proof module: $enable_module_rangeproof]) AC_MSG_NOTICE([Building range proof module: $enable_module_rangeproof])
AC_MSG_NOTICE([Building key whitelisting module: $enable_module_whitelist]) AC_MSG_NOTICE([Building key whitelisting module: $enable_module_whitelist])
AC_MSG_NOTICE([Building surjection proof module: $enable_module_surjectionproof]) AC_MSG_NOTICE([Building surjection proof module: $enable_module_surjectionproof])
# AC_MSG_NOTICE([Building MuSig module: $enable_module_musig]) AC_MSG_NOTICE([Building MuSig module: $enable_module_musig])
AC_MSG_NOTICE([Building extrakeys module: $enable_module_extrakeys]) AC_MSG_NOTICE([Building extrakeys module: $enable_module_extrakeys])
AC_MSG_NOTICE([Building schnorrsig module: $enable_module_schnorrsig]) AC_MSG_NOTICE([Building schnorrsig module: $enable_module_schnorrsig])
AC_MSG_NOTICE([******]) AC_MSG_NOTICE([******])
# if test x"$enable_module_schnorrsig" != x"yes"; then if test x"$enable_module_schnorrsig" != x"yes"; then
# if test x"$enable_module_musig" = x"yes"; then if test x"$enable_module_musig" = x"yes"; then
# AC_MSG_ERROR([MuSig module requires the schnorrsig module. Use --enable-module-schnorrsig to allow.]) AC_MSG_ERROR([MuSig module requires the schnorrsig module. Use --enable-module-schnorrsig to allow.])
# fi fi
# fi fi
if test x"$enable_module_generator" != x"yes"; then if test x"$enable_module_generator" != x"yes"; then
if test x"$enable_module_rangeproof" = x"yes"; then if test x"$enable_module_rangeproof" = x"yes"; then
@ -555,9 +555,9 @@ else
if test x"$enable_module_ecdh" = x"yes"; then if test x"$enable_module_ecdh" = x"yes"; then
AC_MSG_ERROR([ECDH module is experimental. Use --enable-experimental to allow.]) AC_MSG_ERROR([ECDH module is experimental. Use --enable-experimental to allow.])
fi fi
# if test x"$enable_module_musig" = x"yes"; then if test x"$enable_module_musig" = x"yes"; then
# AC_MSG_ERROR([MuSig module is experimental. Use --enable-experimental to allow.]) AC_MSG_ERROR([MuSig module is experimental. Use --enable-experimental to allow.])
# fi fi
if test x"$enable_module_extrakeys" = x"yes"; then if test x"$enable_module_extrakeys" = x"yes"; then
AC_MSG_ERROR([extrakeys module is experimental. Use --enable-experimental to allow.]) AC_MSG_ERROR([extrakeys module is experimental. Use --enable-experimental to allow.])
fi fi
@ -593,7 +593,7 @@ AM_CONDITIONAL([USE_EXHAUSTIVE_TESTS], [test x"$use_exhaustive_tests" != x"no"])
AM_CONDITIONAL([USE_BENCHMARK], [test x"$use_benchmark" = x"yes"]) AM_CONDITIONAL([USE_BENCHMARK], [test x"$use_benchmark" = x"yes"])
AM_CONDITIONAL([USE_ECMULT_STATIC_PRECOMPUTATION], [test x"$set_precomp" = x"yes"]) AM_CONDITIONAL([USE_ECMULT_STATIC_PRECOMPUTATION], [test x"$set_precomp" = x"yes"])
AM_CONDITIONAL([ENABLE_MODULE_ECDH], [test x"$enable_module_ecdh" = x"yes"]) AM_CONDITIONAL([ENABLE_MODULE_ECDH], [test x"$enable_module_ecdh" = x"yes"])
#AM_CONDITIONAL([ENABLE_MODULE_MUSIG], [test x"$enable_module_musig" = x"yes"]) AM_CONDITIONAL([ENABLE_MODULE_MUSIG], [test x"$enable_module_musig" = x"yes"])
AM_CONDITIONAL([ENABLE_MODULE_RECOVERY], [test x"$enable_module_recovery" = x"yes"]) AM_CONDITIONAL([ENABLE_MODULE_RECOVERY], [test x"$enable_module_recovery" = x"yes"])
AM_CONDITIONAL([ENABLE_MODULE_GENERATOR], [test x"$enable_module_generator" = x"yes"]) AM_CONDITIONAL([ENABLE_MODULE_GENERATOR], [test x"$enable_module_generator" = x"yes"])
AM_CONDITIONAL([ENABLE_MODULE_RANGEPROOF], [test x"$enable_module_rangeproof" = x"yes"]) AM_CONDITIONAL([ENABLE_MODULE_RANGEPROOF], [test x"$enable_module_rangeproof" = x"yes"])

2
contrib/travis.sh
View File

@ -18,7 +18,7 @@ fi
--enable-ecmult-static-precomputation="$STATICPRECOMPUTATION" --with-ecmult-gen-precision="$ECMULTGENPRECISION" \ --enable-ecmult-static-precomputation="$STATICPRECOMPUTATION" --with-ecmult-gen-precision="$ECMULTGENPRECISION" \
--enable-module-ecdh="$ECDH" --enable-module-recovery="$RECOVERY" \ --enable-module-ecdh="$ECDH" --enable-module-recovery="$RECOVERY" \
--enable-module-rangeproof="$RANGEPROOF" --enable-module-whitelist="$WHITELIST" --enable-module-generator="$GENERATOR" \ --enable-module-rangeproof="$RANGEPROOF" --enable-module-whitelist="$WHITELIST" --enable-module-generator="$GENERATOR" \
--enable-module-schnorrsig="$SCHNORRSIG" \ --enable-module-schnorrsig="$SCHNORRSIG" --enable-module-musig="$MUSIG" \
--host="$HOST" $EXTRAFLAGS --host="$HOST" $EXTRAFLAGS
if [ -n "$BUILD" ] if [ -n "$BUILD" ]