From 96b9236c425125f348c15b6629b3a73c8a3062f5 Mon Sep 17 00:00:00 2001
From: Andrew Poelstra <apoelstra@wpsoftware.net>
Date: Wed, 14 Oct 2020 15:03:26 +0000
Subject: [PATCH] re-enable musig module

---
 Makefile.am       |  6 +++---
 configure.ac      | 34 +++++++++++++++++-----------------
 contrib/travis.sh |  2 +-
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 715f930f..1cba7a34 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -151,9 +151,9 @@ if ENABLE_MODULE_ECDH
 include src/modules/ecdh/Makefile.am.include
 endif
 
-#if ENABLE_MODULE_MUSIG
-#include src/modules/musig/Makefile.am.include
-#endif
+if ENABLE_MODULE_MUSIG
+include src/modules/musig/Makefile.am.include
+endif
 
 if ENABLE_MODULE_RECOVERY
 include src/modules/recovery/Makefile.am.include
diff --git a/configure.ac b/configure.ac
index 6f177b00..e60583c9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -131,10 +131,10 @@ AC_ARG_ENABLE(module_ecdh,
     [enable_module_ecdh=$enableval],
     [enable_module_ecdh=no])
 
-#AC_ARG_ENABLE(module_musig,
-#    AS_HELP_STRING([--enable-module-musig],[enable MuSig module (experimental)]),
-#    [enable_module_musig=$enableval],
-#    [enable_module_musig=no])
+AC_ARG_ENABLE(module_musig,
+    AS_HELP_STRING([--enable-module-musig],[enable MuSig module (experimental)]),
+    [enable_module_musig=$enableval],
+    [enable_module_musig=no])
 
 AC_ARG_ENABLE(module_recovery,
     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])
 fi
 
-#if test x"$enable_module_musig" = x"yes"; then
-#  AC_DEFINE(ENABLE_MODULE_MUSIG, 1, [Define this symbol to enable the MuSig module])
-#fi
+if test x"$enable_module_musig" = x"yes"; then
+  AC_DEFINE(ENABLE_MODULE_MUSIG, 1, [Define this symbol to enable the MuSig module])
+fi
 
 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])
@@ -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 key whitelisting module: $enable_module_whitelist])
   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 schnorrsig module: $enable_module_schnorrsig])
   AC_MSG_NOTICE([******])
 
 
-#  if test x"$enable_module_schnorrsig" != 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.])
-#    fi
-#  fi
+  if test x"$enable_module_schnorrsig" != 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.])
+    fi
+  fi
 
   if test x"$enable_module_generator" != 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
     AC_MSG_ERROR([ECDH module is experimental. Use --enable-experimental to allow.])
   fi
-#  if test x"$enable_module_musig" = x"yes"; then
-#    AC_MSG_ERROR([MuSig module is experimental. Use --enable-experimental to allow.])
-#  fi
+  if test x"$enable_module_musig" = x"yes"; then
+    AC_MSG_ERROR([MuSig module is experimental. Use --enable-experimental to allow.])
+  fi
   if test x"$enable_module_extrakeys" = x"yes"; then
     AC_MSG_ERROR([extrakeys module is experimental. Use --enable-experimental to allow.])
   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_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_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_GENERATOR], [test x"$enable_module_generator" = x"yes"])
 AM_CONDITIONAL([ENABLE_MODULE_RANGEPROOF], [test x"$enable_module_rangeproof" = x"yes"])
diff --git a/contrib/travis.sh b/contrib/travis.sh
index 25124822..fad6bc18 100755
--- a/contrib/travis.sh
+++ b/contrib/travis.sh
@@ -18,7 +18,7 @@ fi
     --enable-ecmult-static-precomputation="$STATICPRECOMPUTATION" --with-ecmult-gen-precision="$ECMULTGENPRECISION" \
     --enable-module-ecdh="$ECDH" --enable-module-recovery="$RECOVERY" \
     --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
 
 if [ -n "$BUILD" ]