diff --git a/0000-nettle-3.3-remove-ecc-testsuite.patch b/0000-nettle-3.3-remove-ecc-testsuite.patch index 41fd574f6de01e1a981af90247d9f26167d1fc74..782fcb4b63338988c804292378c52ca2eced2413 100644 --- a/0000-nettle-3.3-remove-ecc-testsuite.patch +++ b/0000-nettle-3.3-remove-ecc-testsuite.patch @@ -1,8 +1,8 @@ -From dc6d8a471e38443803e102db560b4db43f5c4191 Mon Sep 17 00:00:00 2001 -From: han_hui_hui -Date: Fri, 1 Dec 2023 08:22:55 +0000 -Subject: [PATCH] 1 - +From b519b23a141752043c9cc9182048c26d80d22af2 Mon Sep 17 00:00:00 2001 +From: Daiki Ueno +Date: Sun, 21 Mar 2021 11:09:51 +0100 +Subject: [PATCH] Remove secp192r1 and secp224r1 support + --- eccdata.c | 67 +---------------------------------- examples/ecc-benchmark.c | 2 -- @@ -12,12 +12,12 @@ Subject: [PATCH] 1 testsuite/ecdsa-verify-test.c | 28 --------------- testsuite/testutils.c | 20 ----------- 7 files changed, 1 insertion(+), 220 deletions(-) - + diff --git a/eccdata.c b/eccdata.c -index 3f8e3f1..06afb20 100644 +index 1b4cb0b5..dc2be5f9 100644 --- a/eccdata.c +++ b/eccdata.c -@@ -435,72 +435,7 @@ ecc_curve_init_str (struct ecc_curve *ecc, enum ecc_type type, +@@ -434,72 +434,7 @@ ecc_curve_init_str (struct ecc_curve *ecc, enum ecc_type type, static void ecc_curve_init (struct ecc_curve *ecc, const char *curve) { @@ -92,10 +92,10 @@ index 3f8e3f1..06afb20 100644 ecc_curve_init_str (ecc, ECC_TYPE_WEIERSTRASS, /* p = 2^{256} - 2^{224} + 2^{192} + 2^{96} - 1 */ diff --git a/examples/ecc-benchmark.c b/examples/ecc-benchmark.c -index 7e857f8..0bffe7a 100644 +index 3ab269c7..402744a0 100644 --- a/examples/ecc-benchmark.c +++ b/examples/ecc-benchmark.c -@@ -314,8 +314,6 @@ bench_curve (const struct ecc_curve *ecc) +@@ -307,8 +307,6 @@ bench_curve (const struct ecc_curve *ecc) } const struct ecc_curve * const curves[] = { @@ -105,7 +105,7 @@ index 7e857f8..0bffe7a 100644 &_nettle_secp_256r1, &_nettle_secp_384r1, diff --git a/examples/hogweed-benchmark.c b/examples/hogweed-benchmark.c -index 3d00802..b8cf902 100644 +index 3d008021..b8cf902c 100644 --- a/examples/hogweed-benchmark.c +++ b/examples/hogweed-benchmark.c @@ -412,23 +412,6 @@ bench_ecdsa_init (unsigned size) @@ -133,7 +133,7 @@ index 3d00802..b8cf902 100644 case 256: ecc = &_nettle_secp_256r1; diff --git a/testsuite/ecdh-test.c b/testsuite/ecdh-test.c -index ff4f723..2be26b1 100644 +index ff4f7233..2be26b19 100644 --- a/testsuite/ecdh-test.c +++ b/testsuite/ecdh-test.c @@ -159,46 +159,6 @@ test_public_key (const char *label, const struct ecc_curve *ecc, @@ -184,10 +184,10 @@ index ff4f723..2be26b1 100644 "94731533361265297353914491124013058635674217345912524033267198103710636378786", "22441589863306126152768848344973918725077248391248404659242620344938484650846", diff --git a/testsuite/ecdsa-sign-test.c b/testsuite/ecdsa-sign-test.c -index b8a100b..bc1ab7e 100644 +index 08a10a1d..0acd4e5c 100644 --- a/testsuite/ecdsa-sign-test.c +++ b/testsuite/ecdsa-sign-test.c -@@ -64,19 +64,6 @@ test_ecdsa (const struct ecc_curve *ecc, +@@ -58,53 +58,6 @@ test_ecdsa (const struct ecc_curve *ecc, void test_main (void) { @@ -204,13 +204,6 @@ index b8a100b..bc1ab7e 100644 - "3a41e1423b1853e8aa89747b1f987364" - "44705d6d6d8371ea1f578f2e"); /* s */ - - /* Produce a signature where verify operation results in a point duplication. */ - test_ecdsa (&_nettle_secp_256r1, - "1", /* Private key */ -@@ -89,40 +76,6 @@ test_main (void) - "53f097727a0e0dc284a0daa0da0ab77d" - "5792ae67ed075d1f8d5bda0f853fa093"); /* s */ - - /* Test cases for the smaller groups, verified with a - proof-of-concept implementation done for Yubico AB. */ - test_ecdsa (&_nettle_secp_192r1, @@ -249,7 +242,7 @@ index b8a100b..bc1ab7e 100644 test_ecdsa (&_nettle_secp_256r1, "DC51D386 6A15BACD E33D96F9 92FCA99D" diff --git a/testsuite/ecdsa-verify-test.c b/testsuite/ecdsa-verify-test.c -index 8d52700..eb5449d 100644 +index 8110c64d..71c0b5c0 100644 --- a/testsuite/ecdsa-verify-test.c +++ b/testsuite/ecdsa-verify-test.c @@ -81,34 +81,6 @@ test_ecdsa (const struct ecc_curve *ecc, @@ -284,14 +277,14 @@ index 8d52700..eb5449d 100644 - "952800792ed19341fdeeec047f2514f3b0f150d6066151fb", /* r */ - "ec5971222014878b50d7a19d8954bc871e7e65b00b860ffb"); /* s */ - - /* Test case provided by Guido Vranken, from oss-fuzz. Triggers - point duplication in the verify operation by using private key = - 1 (public key = generator) and hash = r. */ + /* From RFC 4754 */ + test_ecdsa (&_nettle_secp_256r1, + "2442A5CC 0ECD015F A3CA31DC 8E2BBC70" diff --git a/testsuite/testutils.c b/testsuite/testutils.c -index 3420ae9..cadf8af 100644 +index 2c6cac40..fbf4974c 100644 --- a/testsuite/testutils.c +++ b/testsuite/testutils.c -@@ -1915,8 +1915,6 @@ test_dsa_key(const struct dsa_params *params, +@@ -1656,8 +1656,6 @@ test_dsa_key(const struct dsa_params *params, } const struct ecc_curve * const ecc_curves[] = { @@ -300,7 +293,7 @@ index 3420ae9..cadf8af 100644 &_nettle_secp_256r1, &_nettle_secp_384r1, &_nettle_secp_521r1, -@@ -2041,24 +2039,6 @@ test_ecc_point (const struct ecc_curve *ecc, +@@ -1714,24 +1712,6 @@ test_ecc_point (const struct ecc_curve *ecc, /* For each curve, the points g, 2 g, 3 g and 4 g */ static const struct ecc_ref_point ecc_ref[9][4] = { @@ -326,5 +319,4 @@ index 3420ae9..cadf8af 100644 "4fe342e2fe1a7f9b8ee7eb4a7c0f9e162bce33576b315ececbb6406837bf51f5" }, { "7cf27b188d034f7e8a52380304b51ac3c08969e277f21b35a60b48fc47669978", -- -2.33.0 - +2.30.2 \ No newline at end of file diff --git a/nettle-3.8.1.tar.gz b/nettle-3.8.1.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..9e413238df65cf8c28bb2bbadfea357289a089ec Binary files /dev/null and b/nettle-3.8.1.tar.gz differ diff --git a/nettle-3.9.1.tar.gz b/nettle-3.9.1.tar.gz deleted file mode 100644 index eec992c455c49eb00adec65b471c4aa96937cb23..0000000000000000000000000000000000000000 Binary files a/nettle-3.9.1.tar.gz and /dev/null differ diff --git a/nettle.spec b/nettle.spec index 02f212c5de34ef394495592ee6d3cec6ddbf93cf..12ca43db0a97012b5401ab80d40975c4b41b2dad 100644 --- a/nettle.spec +++ b/nettle.spec @@ -1,5 +1,5 @@ Name: nettle -Version: 3.9.1 +Version: 3.8.1 Release: 1 Summary: A low-level cryptographic library License: LGPLv3+ or GPLv2+ @@ -72,25 +72,19 @@ make check %ldconfig_scriptlets %changelog -* Fri Dec 1 2023 zhongxuan - 3.9.1-1 -- Type:requirement -- Id:NA -- SUG:NA -- DESC:update to release-3.9.1 - * Mon Oct 31 2022 gaihuiying - 3.8.1-1 - Type:requirement - Id:NA - SUG:NA - DESC:update to release-3.8.1 -* Fri Mar 25 2022 xingwei - 3.7.3-2 +* Wed Mar 23 2022 xingwei - 3.7.3-2 - Type:bugfix - Id:NA - SUG:restart - DESC:delete useless so file -* Sat Mar 19 2022 quanhongfei - 3.7.3-1 +* Sat Dec 04 2021 yanglu - 3.7.3-1 - Type:requirements - Id:NA - SUG:NA