[gnutls/f20] added complete patch

Nikos Mavrogiannopoulos nmav at fedoraproject.org
Thu Jan 2 09:29:47 UTC 2014


commit aa2c065b07943695b3eb2f908e3ad9fda6d26f43
Author: Nikos Mavrogiannopoulos <nmav at redhat.com>
Date:   Thu Jan 2 10:27:04 2014 +0100

    added complete patch

 gnutls-3.1.18-suiteb.patch |   11 ++++++++---
 gnutls.spec                |    5 ++++-
 2 files changed, 12 insertions(+), 4 deletions(-)
---
diff --git a/gnutls-3.1.18-suiteb.patch b/gnutls-3.1.18-suiteb.patch
index 0890f5d..8b5974c 100644
--- a/gnutls-3.1.18-suiteb.patch
+++ b/gnutls-3.1.18-suiteb.patch
@@ -28,7 +28,7 @@ diff -ur gnutls-3.1.18.orig/lib/gnutls_priority.c gnutls-3.1.18/lib/gnutls_prior
    GNUTLS_ECC_CURVE_SECP521R1,
 diff -ur gnutls-3.1.18.orig/lib/nettle/ecc_mulmod_cached.c gnutls-3.1.18/lib/nettle/ecc_mulmod_cached.c
 --- gnutls-3.1.18.orig/lib/nettle/ecc_mulmod_cached.c	2013-04-02 22:27:35.000000000 +0200
-+++ gnutls-3.1.18/lib/nettle/ecc_mulmod_cached.c	2014-01-02 09:14:11.152828537 +0100
++++ gnutls-3.1.18/lib/nettle/ecc_mulmod_cached.c	2014-01-02 10:26:08.425986981 +0100
 @@ -42,6 +42,7 @@
  
  /* global cache */
@@ -84,7 +84,7 @@ diff -ur gnutls-3.1.18.orig/lib/nettle/ecc_mulmod_cached.c gnutls-3.1.18/lib/net
  
    err = GNUTLS_E_SUCCESS;
  
-@@ -223,7 +230,8 @@
+@@ -223,11 +230,13 @@
        int i;
        for (i = 0; i < j; ++i)
          {
@@ -94,7 +94,12 @@ diff -ur gnutls-3.1.18.orig/lib/nettle/ecc_mulmod_cached.c gnutls-3.1.18/lib/net
          }
  
        free (ret);
-@@ -445,9 +453,11 @@
+       ecc_wmnaf_cache = NULL;
++      ecc_wmnaf_cache_last = NULL;
+     }
+   return err;
+ }
+@@ -445,9 +454,11 @@
    if (k == NULL || G == NULL || R == NULL || modulus == NULL)
      return GNUTLS_E_RECEIVED_ILLEGAL_PARAMETER;
  
diff --git a/gnutls.spec b/gnutls.spec
index 906d2f7..92cb40a 100644
--- a/gnutls.spec
+++ b/gnutls.spec
@@ -3,7 +3,7 @@
 Summary: A TLS protocol implementation
 Name: gnutls
 Version: 3.1.18
-Release: 2%{?dist}
+Release: 3%{?dist}
 # The libraries are LGPLv2.1+, utilities are GPLv3+, however
 # the bundled gnulib is LGPLv3+
 License: GPLv3+ and LGPLv2+ and LGPLv3+
@@ -276,6 +276,9 @@ fi
 %endif
 
 %changelog
+* Thu Jan 02 2014 Nikos Mavrogiannopoulos <nmav at redhat.com> 3.1.18-3
+- Applied complete patch from (#1046672)
+
 * Thu Jan 02 2014 Nikos Mavrogiannopoulos <nmav at redhat.com> 3.1.18-2
 - Applied fix in suiteb patch to prevent crash in multiple 
   deinitializations (#1046672)


More information about the scm-commits mailing list