[SCM] GNU gnutls branch, master, updated. gnutls_3_0_11-28-gae59e39

[Nikos Mavrogiannopoulos]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU gnutls".

http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=ae59e39662f934f2e697a2b546cdda4cfe4eb9b6

The branch, master has been updated
       via  ae59e39662f934f2e697a2b546cdda4cfe4eb9b6 (commit)
       via  50bf5fce421aba5214d7260973514b05db0785a9 (commit)
      from  0ad7654f3b06d4ef2810a46289d032e6cd1509b0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ae59e39662f934f2e697a2b546cdda4cfe4eb9b6
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Tue Jan 10 18:22:18 2012 +0100

    Eliminated memory leak in ecc_projective_check_point().

commit 50bf5fce421aba5214d7260973514b05db0785a9
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Tue Jan 10 18:21:47 2012 +0100

    updated

-----------------------------------------------------------------------

Summary of changes:
 NEWS                                    |    4 ++--
 cross.mk                                |    6 ++++--
 lib/nettle/ecc_projective_check_point.c |   18 +++++++++++-------
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/NEWS b/NEWS
index da74964..0212a99 100644
--- a/NEWS
+++ b/NEWS
@@ -7,8 +7,8 @@ See the end for copying conditions.
 ** certtool: --outder option now works for private
 and public keys as well.
 
-** libgnutls: Corrected memory leak in DH parameter
-generation.
+** libgnutls: Corrected memory leaks in DH parameter
+generation and ecc_projective_check_point().
 
 ** libgnutls: Added gnutls_x509_dn_oid_name() to 
 return a descriptive name of a DN OID.
diff --git a/cross.mk b/cross.mk
index 1c59639..2d80989 100644
--- a/cross.mk
+++ b/cross.mk
@@ -1,6 +1,6 @@
 
-GNUTLS_FILE:=gnutls-3.0.10.tar.xz
-GNUTLS_DIR:=gnutls-3.0.10
+GNUTLS_FILE:=gnutls-3.0.11.tar.xz
+GNUTLS_DIR:=gnutls-3.0.11
 
 GMP_FILE:=gmp-5.0.2.tar.bz2
 GMP_DIR:=gmp-5.0.2
@@ -22,7 +22,9 @@ update-gpg-keys:
        gpg --recv-keys 96865171 B565716F D92765AF A8F4C2FD DB899F46
 
 $(GNUTLS_DIR)-w32.zip: $(LIB_DIR) $(BIN_DIR) $(GNUTLS_DIR)/.installed
+       -mv $(CROSS_DIR)/lib/include $(CROSS_DIR)/include
        cd $(CROSS_DIR) && zip -r $(PWD)/$@ *
+       gpg --sign --detach $(GNUTLS_DIR)-w32.zip
 
 gnutls-w32: $(GNUTLS_DIR)-w32.zip
 
diff --git a/lib/nettle/ecc_projective_check_point.c 
b/lib/nettle/ecc_projective_check_point.c
index 42abeea..5649779 100644
--- a/lib/nettle/ecc_projective_check_point.c
+++ b/lib/nettle/ecc_projective_check_point.c
@@ -42,17 +42,17 @@ int ecc_projective_check_point (ecc_point * P, mpz_t b, 
mpz_t modulus)
     if (P == NULL || b == NULL || modulus == NULL)
        return -1;
 
-    if ((err = mp_init_multi (&t1, &t2, &t3, NULL)) != 0)
-      {
-         return err;
-      }
-
     if (mpz_cmp_ui (P->z, 1) != 0)
       {
          gnutls_assert ();
          return -1;
       }
 
+    if ((err = mp_init_multi (&t1, &t2, &t3, NULL)) != 0)
+      {
+         return err;
+      }
+
     /* t1 = Z * Z */
     mpz_mul (t1, P->y, P->y);
     mpz_mod (t1, t1, modulus); /* t1 = y^2 */
@@ -95,12 +95,16 @@ int ecc_projective_check_point (ecc_point * P, mpz_t b, 
mpz_t modulus)
 
     if (mpz_cmp_ui (t1, 0) != 0)
       {
-         return -1;
+         err = -1;
       }
     else
       {
-         return 0;
+         err = 0;
       }
+
+    mp_clear_multi(&t1, &t2, &t3, NULL);
+    
+    return err;
 }
 
 #endif


hooks/post-receive
-- 
GNU gnutls