Skip to content

Commit 6e39601

Browse files
whitslackwhitslack
committedNov 23, 2022
dev-libs/libsecp256k1{,-zkp}: drop "precompute-ecmult" USE flag
And change the ecmult window size for USE="lowmem" from 2 to 4. Suggested-by: Tim Ruffing <crypto@timruffing.de> See: bitcoin-core/secp256k1#1159 (comment)
1 parent 0edd048 commit 6e39601

7 files changed

+12
-24
lines changed
 

‎dev-libs/libsecp256k1-zkp/libsecp256k1-zkp-0.1.0_pre20220401.ebuild

+2-4
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,11 @@ SRC_URI="${HOMEPAGE}/archive/${COMMITHASH}.tar.gz -> ${PN}-v${PV}.tgz
1515
LICENSE="MIT"
1616
SLOT="0"
1717
KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
18-
IUSE="+asm +ecdh ecdsa-adaptor ecdsa-s2c experimental external-default-callbacks +extrakeys generator lowmem musig precompute-ecmult rangeproof +recovery +schnorrsig static-libs surjectionproof test valgrind whitelist"
18+
IUSE="+asm +ecdh ecdsa-adaptor ecdsa-s2c experimental external-default-callbacks +extrakeys generator lowmem musig rangeproof +recovery +schnorrsig static-libs surjectionproof test valgrind whitelist"
1919
RESTRICT="!test? ( test )"
2020

2121
REQUIRED_USE="
2222
asm? ( || ( amd64 arm ) arm? ( experimental ) )
23-
?? ( lowmem precompute-ecmult )
2423
ecdsa-adaptor? ( experimental )
2524
ecdsa-s2c? ( experimental )
2625
generator? ( experimental )
@@ -83,8 +82,7 @@ src_configure() {
8382
$(use_enable {,module-}schnorrsig) \
8483
$(use_enable {,module-}surjectionproof)
8584
$(use_enable {,module-}whitelist)
86-
$(usex lowmem '--with-ecmult-window=2 --with-ecmult-gen-precision=2' '')
87-
$(usex precompute-ecmult '--with-ecmult-window=24 --with-ecmult-gen-precision=8' '')
85+
$(usex lowmem '--with-ecmult-window=4 --with-ecmult-gen-precision=2' '')
8886
$(use_with valgrind)
8987
)
9088
if use asm; then

‎dev-libs/libsecp256k1-zkp/libsecp256k1-zkp-0.1.0_pre20220903.ebuild

+2-4
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,11 @@ SRC_URI="${HOMEPAGE}/archive/${COMMITHASH}.tar.gz -> ${P}.tgz
1616
LICENSE="MIT"
1717
SLOT="0"
1818
KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
19-
IUSE="+asm +ecdh ecdsa-adaptor ecdsa-s2c experimental external-default-callbacks +extrakeys generator lowmem musig precompute-ecmult rangeproof +recovery +schnorrsig static-libs surjectionproof test valgrind whitelist"
19+
IUSE="+asm +ecdh ecdsa-adaptor ecdsa-s2c experimental external-default-callbacks +extrakeys generator lowmem musig rangeproof +recovery +schnorrsig static-libs surjectionproof test valgrind whitelist"
2020
RESTRICT="!test? ( test )"
2121

2222
REQUIRED_USE="
2323
asm? ( || ( amd64 arm ) arm? ( experimental ) )
24-
?? ( lowmem precompute-ecmult )
2524
ecdsa-adaptor? ( experimental )
2625
ecdsa-s2c? ( experimental )
2726
generator? ( experimental )
@@ -85,8 +84,7 @@ multilib_src_configure() {
8584
$(use_enable {,module-}schnorrsig) \
8685
$(use_enable {,module-}surjectionproof)
8786
$(use_enable {,module-}whitelist)
88-
$(usex lowmem '--with-ecmult-window=2 --with-ecmult-gen-precision=2' '')
89-
$(usex precompute-ecmult '--with-ecmult-window=24 --with-ecmult-gen-precision=8' '')
87+
$(usex lowmem '--with-ecmult-window=4 --with-ecmult-gen-precision=2' '')
9088
$(use_with valgrind)
9189
)
9290
if use asm; then

‎dev-libs/libsecp256k1-zkp/metadata.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,8 @@
1010
<flag name="external-default-callbacks">Enable external default callback functions</flag>
1111
<flag name="extrakeys">Enable extrakeys module</flag>
1212
<flag name="generator">Enable NUMS generator module</flag>
13-
<flag name="lowmem">Reduce runtime memory usage at the expense of performance (ecmult window size 2, gen precision 2)</flag>
13+
<flag name="lowmem">Reduce runtime memory usage at the expense of performance (ecmult window size 4, gen precision 2)</flag>
1414
<flag name="musig">Enable MuSig module</flag>
15-
<flag name="precompute-ecmult">Use over 512 MB memory at runtime for better performance (ecmult window size 24, gen precision 8)</flag>
1615
<flag name="rangeproof">Enable Pedersen / zero-knowledge range proofs module</flag>
1716
<flag name="recovery">Enable ECDSA pubkey recovery module</flag>
1817
<flag name="schnorrsig">Enable Schnorr signature module</flag>

‎dev-libs/libsecp256k1/libsecp256k1-0.1.0_pre20220803.ebuild

+2-4
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,11 @@ SRC_URI="${HOMEPAGE}/archive/${COMMITHASH}.tar.gz -> ${P}.tgz
1616
LICENSE="MIT"
1717
SLOT="0/20210628" # subslot is date of last ABI change
1818
KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
19-
IUSE="+asm ecdh +experimental +extrakeys lowmem precompute-ecmult +recovery +schnorr static-libs test valgrind"
19+
IUSE="+asm ecdh +experimental +extrakeys lowmem +recovery +schnorr static-libs test valgrind"
2020
RESTRICT="!test? ( test )"
2121

2222
REQUIRED_USE="
2323
asm? ( || ( amd64 arm ) arm? ( experimental ) )
24-
?? ( lowmem precompute-ecmult )
2524
schnorr? ( extrakeys )
2625
"
2726
RDEPEND="
@@ -73,8 +72,7 @@ multilib_src_configure() {
7372
$(use_enable {,module-}extrakeys)
7473
$(use_enable {,module-}recovery)
7574
$(use_enable schnorr module-schnorrsig)
76-
$(usex lowmem '--with-ecmult-window=2 --with-ecmult-gen-precision=2' '')
77-
$(usex precompute-ecmult '--with-ecmult-window=24 --with-ecmult-gen-precision=8' '')
75+
$(usex lowmem '--with-ecmult-window=4 --with-ecmult-gen-precision=2' '')
7876
$(use_with valgrind)
7977
)
8078
if use asm; then

‎dev-libs/libsecp256k1/libsecp256k1-0.1_pre20211216.ebuild

+2-4
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,12 @@ SRC_URI="https://github.com/bitcoin-core/${MyPN}/archive/${COMMITHASH}.tar.gz ->
1414
LICENSE="MIT"
1515
SLOT="0/20210628" # subslot is date of last ABI change
1616
KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
17-
IUSE="+asm ecdh +experimental +extrakeys lowmem precompute-ecmult +schnorr +recovery test valgrind"
17+
IUSE="+asm ecdh +experimental +extrakeys lowmem +schnorr +recovery test valgrind"
1818
RESTRICT="!test? ( test )"
1919

2020
REQUIRED_USE="
2121
asm? ( || ( amd64 arm ) arm? ( experimental ) )
2222
extrakeys? ( experimental )
23-
?? ( lowmem precompute-ecmult )
2423
schnorr? ( experimental extrakeys )
2524
"
2625
RDEPEND="
@@ -67,8 +66,7 @@ src_configure() {
6766
$(use_enable {,module-}extrakeys)
6867
$(use_enable {,module-}recovery)
6968
$(use_enable schnorr module-schnorrsig)
70-
$(usex lowmem '--with-ecmult-window=2 --with-ecmult-gen-precision=2' '')
71-
$(usex precompute-ecmult '--with-ecmult-window=24 --with-ecmult-gen-precision=8' '')
69+
$(usex lowmem '--with-ecmult-window=4 --with-ecmult-gen-precision=2' '')
7270
--disable-static
7371
)
7472

‎dev-libs/libsecp256k1/libsecp256k1-9999.ebuild

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 1999-2020 Gentoo Authors
1+
# Copyright 1999-2022 Gentoo Authors
22
# Distributed under the terms of the GNU General Public License v2
33

44
EAPI=7
@@ -13,13 +13,12 @@ HOMEPAGE="https://github.com/bitcoin-core/secp256k1"
1313
LICENSE="MIT"
1414
SLOT="0"
1515
KEYWORDS=""
16-
IUSE="+asm ecdh +experimental +extrakeys gmp lowmem precompute-ecmult +schnorr +recovery test test-openssl valgrind"
16+
IUSE="+asm ecdh +experimental +extrakeys gmp lowmem +schnorr +recovery test test-openssl valgrind"
1717
RESTRICT="!test? ( test )"
1818

1919
REQUIRED_USE="
2020
asm? ( || ( amd64 arm ) arm? ( experimental ) )
2121
extrakeys? ( experimental )
22-
?? ( lowmem precompute-ecmult )
2322
schnorr? ( experimental extrakeys )
2423
test-openssl? ( test )
2524
"
@@ -61,7 +60,6 @@ src_configure() {
6160
$(use_enable recovery module-recovery) \
6261
$(use_enable schnorr module-schnorrsig) \
6362
$(usex lowmem '--with-ecmult-window=2 --with-ecmult-gen-precision=2' '') \
64-
$(usex precompute-ecmult '--with-ecmult-window=24 --with-ecmult-gen-precision=8' '') \
6563
$(use_with valgrind) \
6664
--disable-static
6765
}

‎dev-libs/libsecp256k1/metadata.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@
1111
<flag name="endomorphism">Enable endomorphism</flag>
1212
<flag name="experimental">Allow experimental USE flags</flag>
1313
<flag name="extrakeys">Enable extrakeys module</flag>
14-
<flag name="lowmem">Reduce runtime memory usage at the expense of performance (ecmult window size 2, gen precision 2)</flag>
15-
<flag name="precompute-ecmult">Use over 512 MB memory at runtime for better performance (ecmult window size 24, gen precision 8)</flag>
14+
<flag name="lowmem">Reduce runtime memory usage at the expense of performance (ecmult window size 4, gen precision 2)</flag>
1615
<flag name="recovery">Enable ECDSA pubkey recovery module</flag>
1716
<flag name="schnorr">Enable Schnorr signature module</flag>
1817
<flag name="test-openssl">Enable OpenSSL comparison tests</flag>

0 commit comments

Comments
 (0)
Please sign in to comment.