build: clamp ECMULT_WINDOW_SIZE to 15 (the largest supported value)

Author: jgriffiths

setup.py

@@ -31,7 +31,7 @@ def call(cmd):
     ]
 if is_windows:
     define_macros.append(('USE_ECMULT_STATIC_PRECOMPUTATION', None))
-    define_macros.append(('ECMULT_WINDOW_SIZE', 16))
+    define_macros.append(('ECMULT_WINDOW_SIZE', 15))
 
 include_dirs=[
     './',

src/wrap_js/windows_config/binding.gyp.elements_tmpl

@@ -3,7 +3,7 @@
     {
       "target_name": "deps",
       "sources": [ "src/combined.c", "src/combined_ccan.c", "src/combined_ccan2.c" ],
-      "defines": [ "SWIG_JAVASCRIPT_BUILD", "HAVE_CONFIG_H", "ECMULT_WINDOW_SIZE=16", "BUILD_ELEMENTS" ],
+      "defines": [ "SWIG_JAVASCRIPT_BUILD", "HAVE_CONFIG_H", "ECMULT_WINDOW_SIZE=15", "BUILD_ELEMENTS" ],
       "include_dirs": [ "<(platform_include_dirs)", "<(libwally_dir)", "<(libwally_dir)/src", "<(libwally_dir)/src/secp256k1", "<(libwally_dir)/src/secp256k1/src", "<(libwally_dir)/src/ccan" ],
       "type": "static_library"
     },
@@ -12,7 +12,7 @@
       "dependencies": [ "deps" ],
       "sources": [ "nodejs_wrap.cc" ],
       "include_dirs": [ "<(platform_include_dirs)", "<(libwally_dir)/src", "<!(node -e \"require('nan')\")" ],
-      "defines": [ "SWIG_JAVASCRIPT_BUILD", "HAVE_CONFIG_H", "ECMULT_WINDOW_SIZE=16", "BUILD_ELEMENTS" ],
+      "defines": [ "SWIG_JAVASCRIPT_BUILD", "HAVE_CONFIG_H", "ECMULT_WINDOW_SIZE=15", "BUILD_ELEMENTS" ],
     }
   ],
   "conditions": [

src/wrap_js/windows_config/binding.gyp.tmpl

@@ -3,7 +3,7 @@
     {
       "target_name": "deps",
       "sources": [ "src/combined.c", "src/combined_ccan.c", "src/combined_ccan2.c" ],
-      "defines": [ "SWIG_JAVASCRIPT_BUILD", "HAVE_CONFIG_H", "ECMULT_WINDOW_SIZE=16" ],
+      "defines": [ "SWIG_JAVASCRIPT_BUILD", "HAVE_CONFIG_H", "ECMULT_WINDOW_SIZE=15" ],
       "include_dirs": [ "<(platform_include_dirs)", "<(libwally_dir)", "<(libwally_dir)/src", "<(libwally_dir)/src/secp256k1", "<(libwally_dir)/src/secp256k1/src", "<(libwally_dir)/src/ccan" ],
       "type": "static_library"
     },
@@ -12,7 +12,7 @@
       "dependencies": [ "deps" ],
       "sources": [ "nodejs_wrap.cc" ],
       "include_dirs": [ "<(platform_include_dirs)", "<(libwally_dir)/src", "<!(node -e \"require('nan')\")" ],
-      "defines": [ "SWIG_JAVASCRIPT_BUILD", "HAVE_CONFIG_H", "ECMULT_WINDOW_SIZE=16" ],
+      "defines": [ "SWIG_JAVASCRIPT_BUILD", "HAVE_CONFIG_H", "ECMULT_WINDOW_SIZE=15" ],
     }
   ],
   "conditions": [

tools/msvc/build.bat

@@ -21,4 +21,4 @@ if "%ELEMENTS_BUILD%" == "elements" (
 REM Compile everything (wally, ccan, libsecp256k) in one lump.
 REM Define USE_ECMULT_STATIC_PRECOMPUTATION  to pick up the
 REM ecmult_static_context.h file generated previously
-cl /utf-8 /DUSE_ECMULT_STATIC_PRECOMPUTATION /DECMULT_WINDOW_SIZE=16 /DWALLY_CORE_BUILD %ELEMENTS_OPT% /DHAVE_CONFIG_H /DSECP256K1_BUILD /I%LIBWALLY_DIR%\src\wrap_js\windows_config /I%LIBWALLY_DIR% /I%LIBWALLY_DIR%\src /I%LIBWALLY_DIR%\include /I%LIBWALLY_DIR%\src\ccan /I%LIBWALLY_DIR%\src\ccan\base64 /I%LIBWALLY_DIR%\src\secp256k1 /Zi /LD src/aes.c src/anti_exfil.c src/base58.c src/base64.c src/bech32.c src/bip32.c src/bip38.c src/bip39.c src/blech32.c src/ecdh.c src/elements.c src/hex.c src/hmac.c src/internal.c src/mnemonic.c src/pbkdf2.c src/psbt.c src/script.c src/scrypt.c src/sign.c src/symmetric.c src/transaction.c src/wif.c src/wordlist.c src/ccan/ccan/crypto/ripemd160/ripemd160.c src/ccan/ccan/crypto/sha256/sha256.c src/ccan/ccan/crypto/sha512/sha512.c src/ccan/ccan/base64/base64_.c src\ccan\ccan\str\hex\hex_.c src/secp256k1/src/secp256k1.c src/secp256k1/src/precomputed_ecmult_gen.c src/secp256k1/src/precomputed_ecmult.c /Fewally.dll
+cl /utf-8 /DUSE_ECMULT_STATIC_PRECOMPUTATION /DECMULT_WINDOW_SIZE=15 /DWALLY_CORE_BUILD %ELEMENTS_OPT% /DHAVE_CONFIG_H /DSECP256K1_BUILD /I%LIBWALLY_DIR%\src\wrap_js\windows_config /I%LIBWALLY_DIR% /I%LIBWALLY_DIR%\src /I%LIBWALLY_DIR%\include /I%LIBWALLY_DIR%\src\ccan /I%LIBWALLY_DIR%\src\ccan\base64 /I%LIBWALLY_DIR%\src\secp256k1 /Zi /LD src/aes.c src/anti_exfil.c src/base58.c src/base64.c src/bech32.c src/bip32.c src/bip38.c src/bip39.c src/blech32.c src/ecdh.c src/elements.c src/hex.c src/hmac.c src/internal.c src/mnemonic.c src/pbkdf2.c src/psbt.c src/script.c src/scrypt.c src/sign.c src/symmetric.c src/transaction.c src/wif.c src/wordlist.c src/ccan/ccan/crypto/ripemd160/ripemd160.c src/ccan/ccan/crypto/sha256/sha256.c src/ccan/ccan/crypto/sha512/sha512.c src/ccan/ccan/base64/base64_.c src\ccan\ccan\str\hex\hex_.c src/secp256k1/src/secp256k1.c src/secp256k1/src/precomputed_ecmult_gen.c src/secp256k1/src/precomputed_ecmult.c /Fewally.dll

tools/travis_install.sh

@@ -16,5 +16,5 @@ if [ "$TRAVIS_OS_NAME" = "windows" ]; then
     npm --version
     npm i -g yarn
 
-    sed -e 's/"defines": \[ "SWIG_JAVASCRIPT_BUILD", "HAVE_CONFIG_H" \]/"defines": \[ "SWIG_JAVASCRIPT_BUILD", "HAVE_CONFIG_H", "USE_ECMULT_STATIC_PRECOMPUTATION", "ECMULT_WINDOW_SIZE=16" \]/g' src/wrap_js/binding.gyp.tmpl > src/wrap_js/binding.gyp
+    sed -e 's/"defines": \[ "SWIG_JAVASCRIPT_BUILD", "HAVE_CONFIG_H" \]/"defines": \[ "SWIG_JAVASCRIPT_BUILD", "HAVE_CONFIG_H", "USE_ECMULT_STATIC_PRECOMPUTATION", "ECMULT_WINDOW_SIZE=15" \]/g' src/wrap_js/binding.gyp.tmpl > src/wrap_js/binding.gyp
 fi