update to release-3.9.1
This commit is contained in:
parent
220814f30e
commit
529a5fe7b4
@ -1,7 +1,7 @@
|
|||||||
From b519b23a141752043c9cc9182048c26d80d22af2 Mon Sep 17 00:00:00 2001
|
From dc6d8a471e38443803e102db560b4db43f5c4191 Mon Sep 17 00:00:00 2001
|
||||||
From: Daiki Ueno <dueno@redhat.com>
|
From: han_hui_hui <hanhuihui5@huawei.com>
|
||||||
Date: Sun, 21 Mar 2021 11:09:51 +0100
|
Date: Fri, 1 Dec 2023 08:22:55 +0000
|
||||||
Subject: [PATCH] Remove secp192r1 and secp224r1 support
|
Subject: [PATCH] 1
|
||||||
|
|
||||||
---
|
---
|
||||||
eccdata.c | 67 +----------------------------------
|
eccdata.c | 67 +----------------------------------
|
||||||
@ -14,10 +14,10 @@ Subject: [PATCH] Remove secp192r1 and secp224r1 support
|
|||||||
7 files changed, 1 insertion(+), 220 deletions(-)
|
7 files changed, 1 insertion(+), 220 deletions(-)
|
||||||
|
|
||||||
diff --git a/eccdata.c b/eccdata.c
|
diff --git a/eccdata.c b/eccdata.c
|
||||||
index 1b4cb0b5..dc2be5f9 100644
|
index 3f8e3f1..06afb20 100644
|
||||||
--- a/eccdata.c
|
--- a/eccdata.c
|
||||||
+++ b/eccdata.c
|
+++ b/eccdata.c
|
||||||
@@ -434,72 +434,7 @@ ecc_curve_init_str (struct ecc_curve *ecc, enum ecc_type type,
|
@@ -435,72 +435,7 @@ ecc_curve_init_str (struct ecc_curve *ecc, enum ecc_type type,
|
||||||
static void
|
static void
|
||||||
ecc_curve_init (struct ecc_curve *ecc, const char *curve)
|
ecc_curve_init (struct ecc_curve *ecc, const char *curve)
|
||||||
{
|
{
|
||||||
@ -92,10 +92,10 @@ index 1b4cb0b5..dc2be5f9 100644
|
|||||||
ecc_curve_init_str (ecc, ECC_TYPE_WEIERSTRASS,
|
ecc_curve_init_str (ecc, ECC_TYPE_WEIERSTRASS,
|
||||||
/* p = 2^{256} - 2^{224} + 2^{192} + 2^{96} - 1 */
|
/* p = 2^{256} - 2^{224} + 2^{192} + 2^{96} - 1 */
|
||||||
diff --git a/examples/ecc-benchmark.c b/examples/ecc-benchmark.c
|
diff --git a/examples/ecc-benchmark.c b/examples/ecc-benchmark.c
|
||||||
index 3ab269c7..402744a0 100644
|
index 7e857f8..0bffe7a 100644
|
||||||
--- a/examples/ecc-benchmark.c
|
--- a/examples/ecc-benchmark.c
|
||||||
+++ b/examples/ecc-benchmark.c
|
+++ b/examples/ecc-benchmark.c
|
||||||
@@ -307,8 +307,6 @@ bench_curve (const struct ecc_curve *ecc)
|
@@ -314,8 +314,6 @@ bench_curve (const struct ecc_curve *ecc)
|
||||||
}
|
}
|
||||||
|
|
||||||
const struct ecc_curve * const curves[] = {
|
const struct ecc_curve * const curves[] = {
|
||||||
@ -105,7 +105,7 @@ index 3ab269c7..402744a0 100644
|
|||||||
&_nettle_secp_256r1,
|
&_nettle_secp_256r1,
|
||||||
&_nettle_secp_384r1,
|
&_nettle_secp_384r1,
|
||||||
diff --git a/examples/hogweed-benchmark.c b/examples/hogweed-benchmark.c
|
diff --git a/examples/hogweed-benchmark.c b/examples/hogweed-benchmark.c
|
||||||
index 3d008021..b8cf902c 100644
|
index 3d00802..b8cf902 100644
|
||||||
--- a/examples/hogweed-benchmark.c
|
--- a/examples/hogweed-benchmark.c
|
||||||
+++ b/examples/hogweed-benchmark.c
|
+++ b/examples/hogweed-benchmark.c
|
||||||
@@ -412,23 +412,6 @@ bench_ecdsa_init (unsigned size)
|
@@ -412,23 +412,6 @@ bench_ecdsa_init (unsigned size)
|
||||||
@ -133,7 +133,7 @@ index 3d008021..b8cf902c 100644
|
|||||||
case 256:
|
case 256:
|
||||||
ecc = &_nettle_secp_256r1;
|
ecc = &_nettle_secp_256r1;
|
||||||
diff --git a/testsuite/ecdh-test.c b/testsuite/ecdh-test.c
|
diff --git a/testsuite/ecdh-test.c b/testsuite/ecdh-test.c
|
||||||
index ff4f7233..2be26b19 100644
|
index ff4f723..2be26b1 100644
|
||||||
--- a/testsuite/ecdh-test.c
|
--- a/testsuite/ecdh-test.c
|
||||||
+++ b/testsuite/ecdh-test.c
|
+++ b/testsuite/ecdh-test.c
|
||||||
@@ -159,46 +159,6 @@ test_public_key (const char *label, const struct ecc_curve *ecc,
|
@@ -159,46 +159,6 @@ test_public_key (const char *label, const struct ecc_curve *ecc,
|
||||||
@ -184,10 +184,10 @@ index ff4f7233..2be26b19 100644
|
|||||||
"94731533361265297353914491124013058635674217345912524033267198103710636378786",
|
"94731533361265297353914491124013058635674217345912524033267198103710636378786",
|
||||||
"22441589863306126152768848344973918725077248391248404659242620344938484650846",
|
"22441589863306126152768848344973918725077248391248404659242620344938484650846",
|
||||||
diff --git a/testsuite/ecdsa-sign-test.c b/testsuite/ecdsa-sign-test.c
|
diff --git a/testsuite/ecdsa-sign-test.c b/testsuite/ecdsa-sign-test.c
|
||||||
index 08a10a1d..0acd4e5c 100644
|
index b8a100b..bc1ab7e 100644
|
||||||
--- a/testsuite/ecdsa-sign-test.c
|
--- a/testsuite/ecdsa-sign-test.c
|
||||||
+++ b/testsuite/ecdsa-sign-test.c
|
+++ b/testsuite/ecdsa-sign-test.c
|
||||||
@@ -58,53 +58,6 @@ test_ecdsa (const struct ecc_curve *ecc,
|
@@ -64,19 +64,6 @@ test_ecdsa (const struct ecc_curve *ecc,
|
||||||
void
|
void
|
||||||
test_main (void)
|
test_main (void)
|
||||||
{
|
{
|
||||||
@ -204,6 +204,13 @@ index 08a10a1d..0acd4e5c 100644
|
|||||||
- "3a41e1423b1853e8aa89747b1f987364"
|
- "3a41e1423b1853e8aa89747b1f987364"
|
||||||
- "44705d6d6d8371ea1f578f2e"); /* s */
|
- "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
|
- /* Test cases for the smaller groups, verified with a
|
||||||
- proof-of-concept implementation done for Yubico AB. */
|
- proof-of-concept implementation done for Yubico AB. */
|
||||||
- test_ecdsa (&_nettle_secp_192r1,
|
- test_ecdsa (&_nettle_secp_192r1,
|
||||||
@ -242,7 +249,7 @@ index 08a10a1d..0acd4e5c 100644
|
|||||||
test_ecdsa (&_nettle_secp_256r1,
|
test_ecdsa (&_nettle_secp_256r1,
|
||||||
"DC51D386 6A15BACD E33D96F9 92FCA99D"
|
"DC51D386 6A15BACD E33D96F9 92FCA99D"
|
||||||
diff --git a/testsuite/ecdsa-verify-test.c b/testsuite/ecdsa-verify-test.c
|
diff --git a/testsuite/ecdsa-verify-test.c b/testsuite/ecdsa-verify-test.c
|
||||||
index 8110c64d..71c0b5c0 100644
|
index 8d52700..eb5449d 100644
|
||||||
--- a/testsuite/ecdsa-verify-test.c
|
--- a/testsuite/ecdsa-verify-test.c
|
||||||
+++ b/testsuite/ecdsa-verify-test.c
|
+++ b/testsuite/ecdsa-verify-test.c
|
||||||
@@ -81,34 +81,6 @@ test_ecdsa (const struct ecc_curve *ecc,
|
@@ -81,34 +81,6 @@ test_ecdsa (const struct ecc_curve *ecc,
|
||||||
@ -277,14 +284,14 @@ index 8110c64d..71c0b5c0 100644
|
|||||||
- "952800792ed19341fdeeec047f2514f3b0f150d6066151fb", /* r */
|
- "952800792ed19341fdeeec047f2514f3b0f150d6066151fb", /* r */
|
||||||
- "ec5971222014878b50d7a19d8954bc871e7e65b00b860ffb"); /* s */
|
- "ec5971222014878b50d7a19d8954bc871e7e65b00b860ffb"); /* s */
|
||||||
-
|
-
|
||||||
/* From RFC 4754 */
|
/* Test case provided by Guido Vranken, from oss-fuzz. Triggers
|
||||||
test_ecdsa (&_nettle_secp_256r1,
|
point duplication in the verify operation by using private key =
|
||||||
"2442A5CC 0ECD015F A3CA31DC 8E2BBC70"
|
1 (public key = generator) and hash = r. */
|
||||||
diff --git a/testsuite/testutils.c b/testsuite/testutils.c
|
diff --git a/testsuite/testutils.c b/testsuite/testutils.c
|
||||||
index 2c6cac40..fbf4974c 100644
|
index 3420ae9..cadf8af 100644
|
||||||
--- a/testsuite/testutils.c
|
--- a/testsuite/testutils.c
|
||||||
+++ b/testsuite/testutils.c
|
+++ b/testsuite/testutils.c
|
||||||
@@ -1656,8 +1656,6 @@ test_dsa_key(const struct dsa_params *params,
|
@@ -1915,8 +1915,6 @@ test_dsa_key(const struct dsa_params *params,
|
||||||
}
|
}
|
||||||
|
|
||||||
const struct ecc_curve * const ecc_curves[] = {
|
const struct ecc_curve * const ecc_curves[] = {
|
||||||
@ -293,7 +300,7 @@ index 2c6cac40..fbf4974c 100644
|
|||||||
&_nettle_secp_256r1,
|
&_nettle_secp_256r1,
|
||||||
&_nettle_secp_384r1,
|
&_nettle_secp_384r1,
|
||||||
&_nettle_secp_521r1,
|
&_nettle_secp_521r1,
|
||||||
@@ -1714,24 +1712,6 @@ test_ecc_point (const struct ecc_curve *ecc,
|
@@ -2041,24 +2039,6 @@ test_ecc_point (const struct ecc_curve *ecc,
|
||||||
|
|
||||||
/* For each curve, the points g, 2 g, 3 g and 4 g */
|
/* For each curve, the points g, 2 g, 3 g and 4 g */
|
||||||
static const struct ecc_ref_point ecc_ref[9][4] = {
|
static const struct ecc_ref_point ecc_ref[9][4] = {
|
||||||
@ -319,4 +326,5 @@ index 2c6cac40..fbf4974c 100644
|
|||||||
"4fe342e2fe1a7f9b8ee7eb4a7c0f9e162bce33576b315ececbb6406837bf51f5" },
|
"4fe342e2fe1a7f9b8ee7eb4a7c0f9e162bce33576b315ececbb6406837bf51f5" },
|
||||||
{ "7cf27b188d034f7e8a52380304b51ac3c08969e277f21b35a60b48fc47669978",
|
{ "7cf27b188d034f7e8a52380304b51ac3c08969e277f21b35a60b48fc47669978",
|
||||||
--
|
--
|
||||||
2.30.2
|
2.33.0
|
||||||
|
|
||||||
|
|||||||
Binary file not shown.
BIN
nettle-3.9.1.tar.gz
Normal file
BIN
nettle-3.9.1.tar.gz
Normal file
Binary file not shown.
@ -1,5 +1,5 @@
|
|||||||
Name: nettle
|
Name: nettle
|
||||||
Version: 3.8.1
|
Version: 3.9.1
|
||||||
Release: 1
|
Release: 1
|
||||||
Summary: A low-level cryptographic library
|
Summary: A low-level cryptographic library
|
||||||
License: LGPLv3+ or GPLv2+
|
License: LGPLv3+ or GPLv2+
|
||||||
@ -72,6 +72,12 @@ make check
|
|||||||
%ldconfig_scriptlets
|
%ldconfig_scriptlets
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Dec 1 2023 zhongxuan <zhongxuan2@huawei.com> - 3.9.1-1
|
||||||
|
- Type:requirement
|
||||||
|
- Id:NA
|
||||||
|
- SUG:NA
|
||||||
|
- DESC:update to release-3.9.1
|
||||||
|
|
||||||
* Mon Oct 31 2022 gaihuiying <eaglegai@163.com> - 3.8.1-1
|
* Mon Oct 31 2022 gaihuiying <eaglegai@163.com> - 3.8.1-1
|
||||||
- Type:requirement
|
- Type:requirement
|
||||||
- Id:NA
|
- Id:NA
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user