mleku/libsecp256k1
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

autotools: Remove "auto" value of --with-ecmult-gen-kb option

Browse Source 
"auto" implies that a value is being chosen based on build system
introspection or host system capabilities. However, for the
`--with-ecmult-gen-kb` option, the value "auto" is hardcoded, which
might lead to confusion.

This change replaces "auto" with a more appropriate default value.
This commit is contained in:
Hennadii Stepanov
2024-05-27 10:46:36 +01:00
parent 122dbaeb37
commit 26b94ee92a
3 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.cirrus.yml
View File

@@ -11,7 +11,7 @@ env:
BUILD: check BUILD: check
### secp256k1 config ### secp256k1 config
ECMULTWINDOW: 15 ECMULTWINDOW: 15
ECMULTGENKB: auto ECMULTGENKB: 22
ASM: no ASM: no
WIDEMUL: auto WIDEMUL: auto
WITH_VALGRIND: yes WITH_VALGRIND: yes

2
.github/workflows/ci.yml vendored
View File

@@ -22,7 +22,7 @@ env:
BUILD: 'check' BUILD: 'check'
### secp256k1 config ### secp256k1 config
ECMULTWINDOW: 15 ECMULTWINDOW: 15
ECMULTGENKB: 'auto' ECMULTGENKB: 22
ASM: 'no' ASM: 'no'
WIDEMUL: 'auto' WIDEMUL: 'auto'
WITH_VALGRIND: 'yes' WITH_VALGRIND: 'yes'

15
configure.ac
View File

@@ -213,12 +213,12 @@ AC_ARG_WITH([ecmult-window], [AS_HELP_STRING([--with-ecmult-window=SIZE],
)], )],
[set_ecmult_window=$withval], [set_ecmult_window=15]) [set_ecmult_window=$withval], [set_ecmult_window=15])
AC_ARG_WITH([ecmult-gen-kb], [AS_HELP_STRING([--with-ecmult-gen-kb=2|22|86|auto], AC_ARG_WITH([ecmult-gen-kb], [AS_HELP_STRING([--with-ecmult-gen-kb=2|22|86],
[The size of the precomputed table for signing in multiples of 1024 bytes (on typical platforms).] [The size of the precomputed table for signing in multiples of 1024 bytes (on typical platforms).]
[Larger values result in possibly better signing/keygeneration performance at the cost of a larger table.] [Larger values result in possibly better signing/keygeneration performance at the cost of a larger table.]
["auto" is a reasonable setting for desktop machines (currently 22). [default=auto]] [The default value is a reasonable setting for desktop machines (currently 22). [default=22]]
)], )],
[req_ecmult_gen_kb=$withval], [req_ecmult_gen_kb=auto]) [set_ecmult_gen_kb=$withval], [set_ecmult_gen_kb=22])
AC_ARG_WITH([valgrind], [AS_HELP_STRING([--with-valgrind=yes|no|auto], AC_ARG_WITH([valgrind], [AS_HELP_STRING([--with-valgrind=yes|no|auto],
[Build with extra checks for running inside Valgrind [default=auto]] [Build with extra checks for running inside Valgrind [default=auto]]
@@ -350,13 +350,6 @@ case $set_ecmult_window in
;; ;;
esac esac
# Set ecmult gen kb
if test x"$req_ecmult_gen_kb" = x"auto"; then
set_ecmult_gen_kb=22
else
set_ecmult_gen_kb=$req_ecmult_gen_kb
fi
case $set_ecmult_gen_kb in case $set_ecmult_gen_kb in
2) 2)
SECP_CONFIG_DEFINES="$SECP_CONFIG_DEFINES -DCOMB_BLOCKS=2 -DCOMB_TEETH=5" SECP_CONFIG_DEFINES="$SECP_CONFIG_DEFINES -DCOMB_BLOCKS=2 -DCOMB_TEETH=5"
@@ -368,7 +361,7 @@ case $set_ecmult_gen_kb in
SECP_CONFIG_DEFINES="$SECP_CONFIG_DEFINES -DCOMB_BLOCKS=43 -DCOMB_TEETH=6" SECP_CONFIG_DEFINES="$SECP_CONFIG_DEFINES -DCOMB_BLOCKS=43 -DCOMB_TEETH=6"
;; ;;
*) *)
AC_MSG_ERROR(['ecmult gen table size not 2, 22, 86 or "auto"']) AC_MSG_ERROR(['ecmult gen table size not 2, 22 or 86'])
;; ;;
esac esac