Squashed 'src/secp256k1/' changes from bdf39000b9..8034c67a48

8034c67a48 Add doc/ellswift.md with ElligatorSwift explanation e90aa4e62e Add ellswift testing to CI 131faedd8a Add ElligatorSwift ctime tests 198a04c058 Add tests for ElligatorSwift 9984bfe476 Add ElligatorSwift benchmarks f053da3ab7 Add ellswift module implementing ElligatorSwift 76c64be237 Add functions to test if X coordinate is valid aff948fca2 Add benchmark for key generation 5ed9314d6d Add exhaustive tests for ecmult_const_xonly b69fe88d5e Add x-only ecmult_const version for x=n/d 427bc3cdcf Merge bitcoin-core/secp256k1#1236: Update comment for secp256k1_modinv32_inv256 647f0a5cb1 Update comment for secp256k1_modinv32_inv256 5658209459 Merge bitcoin-core/secp256k1#1228: release cleanup: bump version after 0.3.0 28e63f7ea7 release cleanup: bump version after 0.3.0 git-subtree-dir: src/secp256k1 git-subtree-split: 8034c67a48dc1334bc74ee4ba239111a23d9789e
dhruv · Mar 20, 2023 · 984b3d0 · 984b3d0
1 parent 763079a
commit 984b3d0
Show file tree

Hide file tree

Showing 21 changed files with 1,947 additions and 16 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -21,6 +21,7 @@ env:
  ECDH: no
  RECOVERY: no
  SCHNORRSIG: no
+ ELLSWIFT: no
  ### test options
  SECP256K1_TEST_ITERS:
  BENCH: yes
@@ -74,12 +75,12 @@ task:
  << : *LINUX_CONTAINER
  matrix: &ENV_MATRIX
  - env: {WIDEMUL: int64, RECOVERY: yes}
- - env: {WIDEMUL: int64, ECDH: yes, SCHNORRSIG: yes}
+ - env: {WIDEMUL: int64, ECDH: yes, SCHNORRSIG: yes, ELLSWIFT: yes}
  - env: {WIDEMUL: int128}
- - env: {WIDEMUL: int128_struct}
- - env: {WIDEMUL: int128, RECOVERY: yes, SCHNORRSIG: yes}
+ - env: {WIDEMUL: int128_struct, ELLSWIFT: yes}
+ - env: {WIDEMUL: int128, RECOVERY: yes, SCHNORRSIG: yes, ELLSWIFT: yes}
  - env: {WIDEMUL: int128, ECDH: yes, SCHNORRSIG: yes}
- - env: {WIDEMUL: int128, ASM: x86_64}
+ - env: {WIDEMUL: int128, ASM: x86_64 , ELLSWIFT: yes}
  - env: { RECOVERY: yes, SCHNORRSIG: yes}
  - env: {CTIMETESTS: no, RECOVERY: yes, ECDH: yes, SCHNORRSIG: yes, CPPFLAGS: -DVERIFY}
  - env: {BUILD: distcheck, WITH_VALGRIND: no, CTIMETESTS: no, BENCH: no}
@@ -154,6 +155,7 @@ task:
  ECDH: yes
  RECOVERY: yes
  SCHNORRSIG: yes
+ ELLSWIFT: yes
  CTIMETESTS: no
  << : *MERGE_BASE
  test_script:
@@ -173,6 +175,7 @@ task:
  ECDH: yes
  RECOVERY: yes
  SCHNORRSIG: yes
+ ELLSWIFT: yes
  CTIMETESTS: no
  matrix:
  - env: {}
@@ -193,6 +196,7 @@ task:
  ECDH: yes
  RECOVERY: yes
  SCHNORRSIG: yes
+ ELLSWIFT: yes
  CTIMETESTS: no
  << : *MERGE_BASE
  test_script:
@@ -210,6 +214,7 @@ task:
  ECDH: yes
  RECOVERY: yes
  SCHNORRSIG: yes
+ ELLSWIFT: yes
  CTIMETESTS: no
  << : *MERGE_BASE
  test_script:
@@ -247,6 +252,7 @@ task:
  RECOVERY: yes
  EXPERIMENTAL: yes
  SCHNORRSIG: yes
+ ELLSWIFT: yes
  CTIMETESTS: no
  # Use a MinGW-w64 host to tell ./configure we're building for Windows.
  # This will detect some MinGW-w64 tools but then make will need only
@@ -286,6 +292,7 @@ task:
  ECDH: yes
  RECOVERY: yes
  SCHNORRSIG: yes
+ ELLSWIFT: yes
  CTIMETESTS: no
  matrix:
  - name: "Valgrind (memcheck)"
@@ -361,6 +368,7 @@ task:
  ECDH: yes
  RECOVERY: yes
  SCHNORRSIG: yes
+ ELLSWIFT: yes
  << : *MERGE_BASE
  test_script:
  - ./ci/cirrus.sh

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -10,15 +10,15 @@ endif()
 # The package (a.k.a. release) version is based on semantic versioning 2.0.0 of
 # the API. All changes in experimental modules are treated as
 # backwards-compatible and therefore at most increase the minor version.
-project(libsecp256k1 VERSION 0.3.0 LANGUAGES C)
+project(libsecp256k1 VERSION 0.3.1 LANGUAGES C)
 
 # The library version is based on libtool versioning of the ABI. The set of
 # rules for updating the version can be found here:
 # https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
 # All changes in experimental modules are treated as if they don't affect the
 # interface and therefore only increase the revision.
 set(${PROJECT_NAME}_LIB_VERSION_CURRENT 2)
-set(${PROJECT_NAME}_LIB_VERSION_REVISION 0)
+set(${PROJECT_NAME}_LIB_VERSION_REVISION 1)
 set(${PROJECT_NAME}_LIB_VERSION_AGE 0)
 
 set(CMAKE_C_STANDARD 90)

diff --git a/Makefile.am b/Makefile.am
@@ -247,3 +247,7 @@ endif
 if ENABLE_MODULE_SCHNORRSIG
 include src/modules/schnorrsig/Makefile.am.include
 endif
+
+if ENABLE_MODULE_ELLSWIFT
+include src/modules/ellswift/Makefile.am.include
+endif
diff --git a/ci/cirrus.sh b/ci/cirrus.sh
@@ -62,6 +62,7 @@ fi
  --with-ecmult-window="$ECMULTWINDOW" \
  --with-ecmult-gen-precision="$ECMULTGENPRECISION" \
  --enable-module-ecdh="$ECDH" --enable-module-recovery="$RECOVERY" \
+ --enable-module-ellswift="$ELLSWIFT" \
  --enable-module-schnorrsig="$SCHNORRSIG" \
  --enable-examples="$EXAMPLES" \
  --enable-ctime-tests="$CTIMETESTS" \

diff --git a/configure.ac b/configure.ac
@@ -5,16 +5,16 @@ AC_PREREQ([2.60])
 # backwards-compatible and therefore at most increase the minor version.
 define(_PKG_VERSION_MAJOR, 0)
 define(_PKG_VERSION_MINOR, 3)
-define(_PKG_VERSION_PATCH, 0)
-define(_PKG_VERSION_IS_RELEASE, true)
+define(_PKG_VERSION_PATCH, 1)
+define(_PKG_VERSION_IS_RELEASE, false)
 
 # The library version is based on libtool versioning of the ABI. The set of
 # rules for updating the version can be found here:
 # https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
 # All changes in experimental modules are treated as if they don't affect the
 # interface and therefore only increase the revision.
 define(_LIB_VERSION_CURRENT, 2)
-define(_LIB_VERSION_REVISION, 0)
+define(_LIB_VERSION_REVISION, 1)
 define(_LIB_VERSION_AGE, 0)
 
 AC_INIT([libsecp256k1],m4_join([.], _PKG_VERSION_MAJOR, _PKG_VERSION_MINOR, _PKG_VERSION_PATCH)m4_if(_PKG_VERSION_IS_RELEASE, [true], [], [-dev]),[https://github.com/bitcoin-core/secp256k1/issues],[libsecp256k1],[https://github.com/bitcoin-core/secp256k1])
@@ -178,6 +178,11 @@ AC_ARG_ENABLE(module_schnorrsig,
  AS_HELP_STRING([--enable-module-schnorrsig],[enable schnorrsig module [default=yes]]), [],
  [SECP_SET_DEFAULT([enable_module_schnorrsig], [yes], [yes])])
 
+AC_ARG_ENABLE(module_ellswift,
+ AS_HELP_STRING([--enable-module-ellswift],[enable ElligatorSwift module (experimental)]),
+ [enable_module_ellswift=$enableval],
+ [enable_module_ellswift=no])
+
 AC_ARG_ENABLE(external_default_callbacks,
  AS_HELP_STRING([--enable-external-default-callbacks],[enable external default callback functions [default=no]]), [],
  [SECP_SET_DEFAULT([enable_external_default_callbacks], [no], [no])])
@@ -380,6 +385,10 @@ if test x"$enable_module_schnorrsig" = x"yes"; then
  enable_module_extrakeys=yes
 fi
 
+if test x"$enable_module_ellswift" = x"yes"; then
+ AC_DEFINE(ENABLE_MODULE_ELLSWIFT, 1, [Define this symbol to enable the ElligatorSwift module])
+fi
+
 # Test if extrakeys is set after the schnorrsig module to allow the schnorrsig
 # module to set enable_module_extrakeys=yes
 if test x"$enable_module_extrakeys" = x"yes"; then
@@ -422,6 +431,7 @@ AM_CONDITIONAL([ENABLE_MODULE_ECDH], [test x"$enable_module_ecdh" = x"yes"])
 AM_CONDITIONAL([ENABLE_MODULE_RECOVERY], [test x"$enable_module_recovery" = x"yes"])
 AM_CONDITIONAL([ENABLE_MODULE_EXTRAKEYS], [test x"$enable_module_extrakeys" = x"yes"])
 AM_CONDITIONAL([ENABLE_MODULE_SCHNORRSIG], [test x"$enable_module_schnorrsig" = x"yes"])
+AM_CONDITIONAL([ENABLE_MODULE_ELLSWIFT], [test x"$enable_module_ellswift" = x"yes"])
 AM_CONDITIONAL([USE_EXTERNAL_ASM], [test x"$enable_external_asm" = x"yes"])
 AM_CONDITIONAL([USE_ASM_ARM], [test x"$set_asm" = x"arm"])
 AM_CONDITIONAL([BUILD_WINDOWS], [test "$build_windows" = "yes"])
@@ -443,6 +453,7 @@ echo " module ecdh = $enable_module_ecdh"
 echo " module recovery = $enable_module_recovery"
 echo " module extrakeys = $enable_module_extrakeys"
 echo " module schnorrsig = $enable_module_schnorrsig"
+echo " module ellswift = $enable_module_ellswift"
 echo
 echo " asm = $set_asm"
 echo " ecmult window size = $set_ecmult_window"