From b3578efca889403f7f8cc2fda8588b61e9cdc30f Mon Sep 17 00:00:00 2001
From: Tomas Mraz <tmraz@fedoraproject.org>
Date: Thu, 29 Mar 2012 17:44:48 +0200
Subject: [PATCH] new upstream version

---
 .gitignore                |  1 +
 gnutls-2.12.14-leak.patch | 56 ---------------------------------------
 gnutls.spec               |  7 ++---
 sources                   |  2 +-
 4 files changed, 6 insertions(+), 60 deletions(-)
 delete mode 100644 gnutls-2.12.14-leak.patch

diff --git a/.gitignore b/.gitignore
index 705b8ad..b5bc58b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ gnutls-2.10.1-nosrp.tar.bz2
 /gnutls-2.12.12-nosrp.tar.bz2
 /gnutls-2.12.14-nosrp.tar.bz2
 /gnutls-2.12.17-nosrp.tar.xz
+/gnutls-2.12.18-nosrp.tar.xz
diff --git a/gnutls-2.12.14-leak.patch b/gnutls-2.12.14-leak.patch
deleted file mode 100644
index 0a649df..0000000
--- a/gnutls-2.12.14-leak.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff -up gnutls-2.12.14/lib/gcrypt/pk.c.leak gnutls-2.12.14/lib/gcrypt/pk.c
---- gnutls-2.12.14/lib/gcrypt/pk.c.leak	2011-09-18 00:16:53.000000000 +0200
-+++ gnutls-2.12.14/lib/gcrypt/pk.c	2012-03-08 17:54:16.821192070 +0100
-@@ -627,7 +627,6 @@ _rsa_generate_params (bigint_t * resarr,
- 
-   int ret, i;
-   gcry_sexp_t parms, key, list;
--  bigint_t tmp;
- 
-   if (*resarr_len < RSA_PRIVATE_PARAMS)
-     {
-@@ -733,14 +732,6 @@ _rsa_generate_params (bigint_t * resarr,
- 
-   *resarr_len = 6;
- 
--  tmp = _gnutls_mpi_alloc_like (resarr[0]);
--  if (tmp == NULL)
--    {
--      gnutls_assert ();
--      ret = GNUTLS_E_MEMORY_ERROR;
--      goto cleanup;
--    }
--
-   ret = _gnutls_calc_rsa_exp (resarr, 2 + *resarr_len);
-   if (ret < 0)
-     {
-diff -up gnutls-2.12.14/lib/gnutls_pk.c.leak gnutls-2.12.14/lib/gnutls_pk.c
---- gnutls-2.12.14/lib/gnutls_pk.c.leak	2011-09-18 00:16:53.000000000 +0200
-+++ gnutls-2.12.14/lib/gnutls_pk.c	2012-03-08 17:40:58.725314720 +0100
-@@ -544,6 +544,7 @@ _generate_params (int algo, bigint_t * r
-     }
-   else
-     {
-+      gnutls_pk_params_release(&params);
-       gnutls_assert ();
-       return GNUTLS_E_INVALID_REQUEST;
-     }
-diff -up gnutls-2.12.14/lib/x509/privkey.c.leak gnutls-2.12.14/lib/x509/privkey.c
---- gnutls-2.12.14/lib/x509/privkey.c.leak	2011-09-18 00:16:54.000000000 +0200
-+++ gnutls-2.12.14/lib/x509/privkey.c	2012-03-08 17:45:55.467830355 +0100
-@@ -1466,6 +1466,7 @@ gnutls_x509_privkey_generate (gnutls_x50
-         {
-           gnutls_assert ();
-           ret = GNUTLS_E_INTERNAL_ERROR;
-+          goto cleanup;
-         }
- 
-       if (ret < 0)
-@@ -1490,6 +1491,7 @@ gnutls_x509_privkey_generate (gnutls_x50
-         {
-           gnutls_assert ();
-           ret = GNUTLS_E_INTERNAL_ERROR;
-+          goto cleanup;
-         }
-       if (ret < 0)
-         {
diff --git a/gnutls.spec b/gnutls.spec
index 9624094..cd07ef2 100644
--- a/gnutls.spec
+++ b/gnutls.spec
@@ -1,6 +1,6 @@
 Summary: A TLS protocol implementation
 Name: gnutls
-Version: 2.12.17
+Version: 2.12.18
 Release: 1%{?dist}
 # The libgnutls library is LGPLv2+, utilities and remaining libraries are GPLv3+
 License: GPLv3+ and LGPLv2+
@@ -21,7 +21,6 @@ Patch2: gnutls-2.8.6-link-libgcrypt.patch
 Patch3: gnutls-2.12.2-nosrp.patch
 # Skip tests that are expected to fail on libgcrypt build
 Patch4: gnutls-2.12.7-dsa-skiptests.patch
-Patch5: gnutls-2.12.14-leak.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: libgcrypt >= 1.2.2
@@ -89,7 +88,6 @@ This package contains Guile bindings for the library.
 %patch2 -p1 -b .link
 %patch3 -p1 -b .nosrp
 %patch4 -p1 -b .skiptests
-%patch5 -p1 -b .leak
 
 for i in auth_srp_rsa.c auth_srp_sb64.c auth_srp_passwd.c auth_srp.c gnutls_srp.c ext_srp.c; do
     touch lib/$i
@@ -191,6 +189,9 @@ fi
 %{_datadir}/guile/site/gnutls.scm
 
 %changelog
+* Thu Mar 29 2012 Tomas Mraz <tmraz@redhat.com> 2.12.18-1
+- new upstream version
+
 * Thu Mar  8 2012 Tomas Mraz <tmraz@redhat.com> 2.12.17-1
 - new upstream version
 - fix leaks in key generation (#796302)
diff --git a/sources b/sources
index a663029..356e5dc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c4815ceca3e799fc16cbef3f743d3fed  gnutls-2.12.17-nosrp.tar.xz
+dc9b382ee34c46808624c6496cc2162f  gnutls-2.12.18-nosrp.tar.xz