rpms / mingw-nettle

Clone
Source Code
GIT

#3 Update the sources accordingly to its native counter part (3.5.1)
Closed 4 years ago by mooninite. Opened 4 years ago by fidencio.
rpms/ fidencio/mingw-nettle wip/rhbz1740768  into  master

file modified
+1 
@@ -1,1 +1,2 @@ 
 

  /nettle-3.4.1-hobbled.tar.xz
 

+ /nettle-3.5.1-hobbled.tar.xz

file modified
+10 -7 
@@ -1,15 +1,15 @@ 
 

  %{?mingw_package_header}
 

  

  Name:           mingw-nettle
 

- Version:        3.4.1
 

- Release:        3%{?dist}
 

+ Version:        3.5.1
 

+ Release:        1%{?dist}
 

  

  Summary: MinGW package for nettle cryptographic library
 

  License: LGPLv3+ or GPLv2+
 

  URL:    http://www.lysator.liu.se/~nisse/nettle/
 

  # https://ftp.gnu.org/gnu/nettle/nettle-%{version}.tar.gz
 

  Source: nettle-%{version}-hobbled.tar.xz
 

- Patch0: nettle-3.3-remove-ecc-testsuite.patch
 

+ Patch0: nettle-3.5.1-remove-ecc-testsuite.patch
 

  

  BuildArch:      noarch
 

  
@@ -97,8 +97,8 @@ 
 

  %{mingw32_bindir}/nettle-pbkdf2.exe
 

  %{mingw32_bindir}/pkcs1-conv.exe
 

  %{mingw32_bindir}/sexp-conv.exe
 

- %{mingw32_bindir}/libnettle-6.dll
 

- %{mingw32_bindir}/libhogweed-4.dll
 

+ %{mingw32_bindir}/libnettle-7.dll
 

+ %{mingw32_bindir}/libhogweed-5.dll
 

  %{mingw32_libdir}/libnettle.dll.a
 

  %{mingw32_libdir}/libhogweed.dll.a
 

  %{mingw32_libdir}/pkgconfig/nettle.pc
 
@@ -116,8 +116,8 @@ 
 

  %{mingw64_bindir}/nettle-pbkdf2.exe
 

  %{mingw64_bindir}/pkcs1-conv.exe
 

  %{mingw64_bindir}/sexp-conv.exe
 

- %{mingw64_bindir}/libnettle-6.dll
 

- %{mingw64_bindir}/libhogweed-4.dll
 

+ %{mingw64_bindir}/libnettle-7.dll
 

+ %{mingw64_bindir}/libhogweed-5.dll
 

  %{mingw64_libdir}/libnettle.dll.a
 

  %{mingw64_libdir}/libhogweed.dll.a
 

  %{mingw64_libdir}/pkgconfig/nettle.pc
 
@@ -127,6 +127,9 @@ 
 

  

  

  %changelog
 

+ * Wed Aug 14 2019 Fabiano Fidêncio <fidencio@redhat.com> - 3.5.1-1
 

+ - Update the sources accordingly to its native counter part, rhbz#1740768
 

+ 

  * Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.1-3
 

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

nettle-3.5.1-remove-ecc-testsuite.patch nettle-3.3-remove-ecc-testsuite.patch
file renamed
+52 -32 
@@ -1,26 +1,43 @@ 
 

+ From a3214a049adf3a43d7cb07cbe4d1bf78b397caf8 Mon Sep 17 00:00:00 2001
 

+ From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fidencio@redhat.com>
 

+ Date: Wed, 14 Aug 2019 10:43:56 +0200
 

+ Subject: [PATCH] nettle-3.5.1: remove ecc testsuite
 

+ MIME-Version: 1.0
 

+ Content-Type: text/plain; charset=UTF-8
 

+ Content-Transfer-Encoding: 8bit
 

+ 

+ Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
 

+ ---
 

+  examples/ecc-benchmark.c     |  2 --
 

+  examples/hogweed-benchmark.c | 31 -------------------------------
 

+  testsuite/ecdh-test.c        | 20 --------------------
 

+  testsuite/ecdsa-sign-test.c  | 32 --------------------------------
 

+  testsuite/testutils.c        | 16 ----------------
 

+  5 files changed, 101 deletions(-)
 

+ 

  diff --git a/examples/ecc-benchmark.c b/examples/ecc-benchmark.c
 

- index 8e5e095..720d483 100644
 

+ index ea0be17..6667560 100644
 

  --- a/examples/ecc-benchmark.c
 

  +++ b/examples/ecc-benchmark.c
 

  @@ -330,8 +330,6 @@ bench_curve (const struct ecc_curve *ecc)
 

   }
 

   

   const struct ecc_curve * const curves[] = {
 

- -  &nettle_secp_192r1,
 

- -  &nettle_secp_224r1,
 

+ -  &_nettle_secp_192r1,
 

+ -  &_nettle_secp_224r1,
 

     &_nettle_curve25519,
 

-    &nettle_secp_256r1,
 

-    &nettle_secp_384r1,
 

+    &_nettle_secp_256r1,
 

+    &_nettle_secp_384r1,
 

  diff --git a/examples/hogweed-benchmark.c b/examples/hogweed-benchmark.c
 

- index 3fabe20..0223fe7 100644
 

+ index accdf87..5314f81 100644
 

  --- a/examples/hogweed-benchmark.c
 

  +++ b/examples/hogweed-benchmark.c
 

- @@ -393,24 +393,6 @@ bench_ecdsa_init (unsigned size)
 

+ @@ -409,23 +409,6 @@ bench_ecdsa_init (unsigned size)
 

   

     switch (size)
 

       {
 

  -    case 192:
 

- -      ecc = &nettle_secp_192r1;
 

+ -      ecc = &_nettle_secp_192r1;
 

  -      xs = "8e8e07360350fb6b7ad8370cfd32fa8c6bba785e6e200599";
 

  -      ys = "7f82ddb58a43d59ff8dc66053002b918b99bd01bd68d6736";
 

  -      zs = "f2e620e086d658b4b507996988480917640e4dc107808bdd";
 
@@ -28,7 +45,7 @@ 
 

  -      ctx->digest_size = 20;
 

  -      break;
 

  -    case 224:
 

- -      ecc = &nettle_secp_224r1;
 

+ -      ecc = &_nettle_secp_224r1;
 

  -      xs = "993bf363f4f2bc0f255f22563980449164e9c894d9efd088d7b77334";
 

  -      ys = "b75fff9849997d02d135140e4d0030944589586e22df1fc4b629082a";
 

  -      zs = "cdfd01838247f5de3cc70b688418046f10a2bfaca6de9ec836d48c27";
 
@@ -36,11 +53,10 @@ 
 

  -      ctx->digest_size = 28;
 

  -      break;
 

  -
 

- -      /* From RFC 4754 */
 

+        /* From RFC 4754 */
 

       case 256:
 

-        ecc = &nettle_secp_256r1;
 

-        xs = "2442A5CC 0ECD015F A3CA31DC 8E2BBC70 BF42D60C BCA20085 E0822CB0 4235E970";
 

- @@ -581,16 +563,6 @@ bench_openssl_ecdsa_init (unsigned size)
 

+        ecc = &_nettle_secp_256r1;
 

+ @@ -613,16 +596,6 @@ bench_openssl_ecdsa_init (unsigned size)
 

   

     switch (size)
 

       {
 
@@ -57,7 +73,7 @@ 
 

       case 256:
 

         ctx->key = EC_KEY_new_by_curve_name (NID_X9_62_prime256v1);
 

         ctx->digest_length = SHA256_DIGEST_SIZE;
 

- @@ -701,14 +673,10 @@ struct alg alg_list[] = {
 

+ @@ -740,14 +713,10 @@ struct alg alg_list[] = {
 

   #if 0
 

     { "dsa",2048, bench_dsa_init, bench_dsa_sign,   bench_dsa_verify, bench_dsa_clear },
 

   #endif
 
@@ -73,14 +89,14 @@ 
 

     { "ecdsa (openssl)",  384, bench_openssl_ecdsa_init, bench_openssl_ecdsa_sign, bench_openssl_ecdsa_verify, bench_openssl_ecdsa_clear },
 

     { "ecdsa (openssl)",  521, bench_openssl_ecdsa_init, bench_openssl_ecdsa_sign, bench_openssl_ecdsa_verify, bench_openssl_ecdsa_clear },
 

  diff --git a/testsuite/ecdh-test.c b/testsuite/ecdh-test.c
 

- index 5a2b39d..08870b1 100644
 

+ index 2bfffd6..bee48a5 100644
 

  --- a/testsuite/ecdh-test.c
 

  +++ b/testsuite/ecdh-test.c
 

  @@ -138,26 +138,6 @@ test_dh (const char *name, const struct ecc_curve *ecc,
 

   void
 

   test_main(void)
 

   {
 

- -  test_dh ("secp-192r1", &nettle_secp_192r1,
 

+ -  test_dh ("secp-192r1", &_nettle_secp_192r1,
 

  -	   "3406157206141798348095184987208239421004566462391397236532",
 

  -	   "1050363442265225480786760666329560655512990381040021438562",
 

  -	   "5298249600854377235107392014200406283816103564916230704184",
 
@@ -90,7 +106,7 @@ 
 

  -	   "149293809021051532782730990145509724807636529827149481690",
 

  -	   "2891131861147398318714693938158856874319184314120776776192");
 

  -
 

- -  test_dh ("secp-224r1", &nettle_secp_224r1,
 

+ -  test_dh ("secp-224r1", &_nettle_secp_224r1,
 

  -	   "1321072106881784386340709783538698930880431939595776773514895067682",
 

  -	   "6768311794185371282972144247871764855860666277647541840973645586477",
 

  -	   "2880077809069104378181313860274147139049600284805670362929579614547",
 
@@ -100,18 +116,18 @@ 
 

  -	   "8330362698029245839097779050425944245826040430538860338085968752913",
 

  -	   "24167244512472228715617822000878192535267113543393576038737592837010");	   

  -
 

-    test_dh ("secp-256r1", &nettle_secp_256r1,
 

+    test_dh ("secp-256r1", &_nettle_secp_256r1,
 

   	   "94731533361265297353914491124013058635674217345912524033267198103710636378786",
 

   	   "22441589863306126152768848344973918725077248391248404659242620344938484650846",
 

  diff --git a/testsuite/ecdsa-sign-test.c b/testsuite/ecdsa-sign-test.c
 

- index 559de8e..1ca36c2 100644
 

+ index 2327535..63ef044 100644
 

  --- a/testsuite/ecdsa-sign-test.c
 

  +++ b/testsuite/ecdsa-sign-test.c
 

- @@ -60,37 +60,6 @@ test_main (void)
 

+ @@ -60,38 +60,6 @@ test_main (void)
 

   {
 

     /* Test cases for the smaller groups, verified with a
 

        proof-of-concept implementation done for Yubico AB. */
 

- -  test_ecdsa (&nettle_secp_192r1,
 

+ -  test_ecdsa (&_nettle_secp_192r1,
 

  -	      "DC51D3866A15BACDE33D96F992FCA99D"
 

  -	      "A7E6EF0934E70975", /* z */
 

  -
 
@@ -127,7 +143,7 @@ 
 

  -	      "a91fb738f9f175d72f9c98527e881c36"
 

  -	      "8de68cb55ffe589"); /* s */
 

  -
 

- -  test_ecdsa (&nettle_secp_224r1,
 

+ -  test_ecdsa (&_nettle_secp_224r1,
 

  -	      "446df0a771ed58403ca9cb316e617f6b"
 

  -	      "158420465d00a69601e22858",  /* z */
 

  -
 
@@ -142,23 +158,24 @@ 
 

  -
 

  -	      "d0f069fd0f108eb07b7bbc54c8d6c88d"
 

  -	      "f2715c38a95c31a2b486995f"); /* s */
 

-  

+ -
 

     /* From RFC 4754 */
 

-    test_ecdsa (&nettle_secp_256r1,
 

+    test_ecdsa (&_nettle_secp_256r1,
 

+  	      "DC51D386 6A15BACD E33D96F9 92FCA99D"
 

  diff --git a/testsuite/testutils.c b/testsuite/testutils.c
 

- index 6f89761..901f62b 100644
 

+ index 337e4c4..d8f0137 100644
 

  --- a/testsuite/testutils.c
 

  +++ b/testsuite/testutils.c
 

- @@ -1212,8 +1212,6 @@ test_dsa_key(const struct dsa_params *params,
 

+ @@ -1577,8 +1577,6 @@ test_dsa_key(const struct dsa_params *params,
 

   }
 

   

   const struct ecc_curve * const ecc_curves[] = {
 

- -  &nettle_secp_192r1,
 

- -  &nettle_secp_224r1,
 

-    &nettle_secp_256r1,
 

-    &nettle_secp_384r1,
 

-    &nettle_secp_521r1,
 

- @@ -1270,20 +1268,6 @@ test_ecc_mul_a (unsigned curve, unsigned n, const mp_limb_t *p)
 

+ -  &_nettle_secp_192r1,
 

+ -  &_nettle_secp_224r1,
 

+    &_nettle_secp_256r1,
 

+    &_nettle_secp_384r1,
 

+    &_nettle_secp_521r1,
 

+ @@ -1635,20 +1633,6 @@ test_ecc_mul_a (unsigned curve, unsigned n, const mp_limb_t *p)
 

   {
 

     /* For each curve, the points 2 g, 3 g and 4 g */
 

     static const struct ecc_ref_point ref[6][3] = {
 
@@ -179,3 +196,6 @@ 
 

       { { "7cf27b188d034f7e8a52380304b51ac3c08969e277f21b35a60b48fc47669978",
 

   	"7775510db8ed040293d9ac69f7430dbba7dade63ce982299e04b79d227873d1" },
 

         { "5ecbe4d1a6330a44c8f7ef951d4bf165e6c6b721efada985fb41661bc6e7fd6c",
 

+ -- 

+ 2.21.0
 

+

file modified
+1 -1 
@@ -1,1 +1,1 @@ 
 

- SHA512 (nettle-3.4.1-hobbled.tar.xz) = 9a5b4c316222f22feb692106ceae299c2b59229ef96cac1739095c65c9ddee4b1d542579e5b49d4863bd6a8c093611f0fdd1c7cb3251844c85b7e089e406ffc5
 

+ SHA512 (nettle-3.5.1-hobbled.tar.xz) = dc67a06e42327bddc10ec303ce49309873aeb6dcd77f2775837d11c2982dcf11c663b712571ebd33862408d1a61c26eca629122ca20a591840777530571aeb9c

Resolves: rhbz#1740768

This patch should also be backported to f31.

Both local and scratch build passed: https://koji.fedoraproject.org/koji/taskinfo?taskID=37034657

Thanks. I'll have to kick off rebuilds for gnutls, libarchive, and gstreamer1 due to the DLL bump.

Metadata Update from @mooninite:
- Request assigned
4 years ago

Pull-Request has been closed by mooninite
4 years ago
Changes Summary 4
+1 -0
file changed
.gitignore
+10 -7
file changed
mingw-nettle.spec
+52 -32
file renamed
nettle-3.3-remove-ecc-testsuite.patch
nettle-3.5.1-remove-ecc-testsuite.patch
+1 -1
file changed
sources
Powered by Pagure 5.13.3
Documentation • File an Issue • About this Instance • SSH Hostkey/Fingerprint
© Red Hat, Inc. and others.