Merge branch 'main' into unittest_svnn_and_legacy

AntelopeIO · May 16, 2024 · 3846aa0 · 3846aa0
2 parents bb771e4 + 22d970f
commit 3846aa0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/libraries/libfc/secp256k1/CMakeLists.txt b/libraries/libfc/secp256k1/CMakeLists.txt
@@ -5,10 +5,12 @@ add_library(secp256k1-internal INTERFACE)
 target_include_directories(secp256k1-internal INTERFACE secp256k1/src)
 
 target_compile_definitions(secp256k1-internal INTERFACE ENABLE_MODULE_RECOVERY=1
-                                                        ECMULT_GEN_PREC_BITS=4
+                                                        ENABLE_MODULE_EXTRAKEYS=1
+                                                        COMB_BLOCKS=11
+                                                        COMB_TEETH=6
                                                         ECMULT_WINDOW_SIZE=15
                                                         SECP256K1_STATIC=1)
-if(CMAKE_SYSTEM_PROCESSOR STREQUAL x86_64 OR CMAKE_SYSTEM_PROCESSOR STREQUAL amd64)
+if(CMAKE_SYSTEM_PROCESSOR STREQUAL x86_64)
   target_compile_definitions(secp256k1-internal INTERFACE USE_ASM_X86_64=1)
 endif()
 

diff --git a/libraries/libfc/secp256k1/secp256k1 b/libraries/libfc/secp256k1/secp256k1
+1 −1		.cirrus.yml
+1 −1		.github/actions/install-homebrew-valgrind/action.yml
+5 −0		.github/actions/run-in-docker-action/action.yml
+9 −9		.github/workflows/ci.yml
+14 −0		CHANGELOG.md
+50 −22		CMakeLists.txt
+1 −1		CONTRIBUTING.md
+2 −0		Makefile.am
+3 −3		README.md
+4 −3		ci/ci.sh
+12 −0		cmake/AllTargetsCompileOptions.cmake
+41 −33		configure.ac
+2 −2		contrib/lax_der_parsing.h
+36 −36		doc/release-process.md
+47 −33		include/secp256k1.h
+1 −1		include/secp256k1_ecdh.h
+2 −2		include/secp256k1_ellswift.h
+5 −5		include/secp256k1_extrakeys.h
+7 −7		include/secp256k1_preallocated.h
+10 −10		include/secp256k1_recovery.h
+2 −2		include/secp256k1_schnorrsig.h
+52 −48		src/assumptions.h
+7 −0		src/checkmem.h
+2 −2		src/ecmult_const_impl.h
+108 −13		src/ecmult_gen.h
+2 −2		src/ecmult_gen_compute_table.h
+79 −55		src/ecmult_gen_compute_table_impl.h
+261 −51		src/ecmult_gen_impl.h
+6 −6		src/ecmult_impl.h
+2 −2		src/field.h
+33 −0		src/hsort.h
+125 −0		src/hsort_impl.h
+4 −4		src/modules/ellswift/tests_impl.h
+49 −28		src/precompute_ecmult_gen.c
+1,767 −9,734		src/precomputed_ecmult_gen.c
+2 −2		src/precomputed_ecmult_gen.h
+4 −4		src/scalar.h
+47 −25		src/scalar_4x64_impl.h
+7 −6		src/scalar_8x32_impl.h
+2 −2		src/scalar_impl.h
+19 −12		src/scalar_low_impl.h
+43 −25		src/secp256k1.c
+305 −41		src/tests.c
+1 −1		src/tests_exhaustive.c
+31 −2		src/util.h
+15 −12		tools/check-abi.sh