[SCM] GNU gnutls branch, master, updated. gnutls-3_0_12-88-gf85b102

[Simon Josefsson]

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=f85b10210f68649957ddc285c79b91ee86fce4ba

The branch, master has been updated
       via  f85b10210f68649957ddc285c79b91ee86fce4ba (commit)
       via  82498bad27645c47222fa932a7caa2e95747980a (commit)
      from  8790dc9cca0ff3d22efe06f3556d7ade51419d73 (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 f85b10210f68649957ddc285c79b91ee86fce4ba
Author: Simon Josefsson <address@hidden>
Date:   Wed Jan 25 13:29:29 2012 +0100

    Fix mem leaks.

commit 82498bad27645c47222fa932a7caa2e95747980a
Author: Simon Josefsson <address@hidden>
Date:   Wed Jan 25 12:20:17 2012 +0100

    Enable valgrind again.

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

Summary of changes:
 gl/m4/valgrind-tests.m4               |    2 +-
 gl/override/m4/valgrind-tests.m4.diff |   11 -----------
 tests/infoaccess.c                    |    2 ++
 tests/mpi.c                           |    4 +++-
 tests/openpgp-auth.c                  |    2 ++
 tests/openpgp-auth2.c                 |    2 ++
 tests/openssl.c                       |    2 ++
 tests/pkcs12_encode.c                 |    2 --
 tests/rng-fork.c                      |    2 ++
 9 files changed, 14 insertions(+), 15 deletions(-)
 delete mode 100644 gl/override/m4/valgrind-tests.m4.diff

diff --git a/gl/m4/valgrind-tests.m4 b/gl/m4/valgrind-tests.m4
index 077e025..6f2790e 100644
--- a/gl/m4/valgrind-tests.m4
+++ b/gl/m4/valgrind-tests.m4
@@ -21,7 +21,7 @@ AC_DEFUN([gl_VALGRIND_TESTS],
     AC_CHECK_PROGS(VALGRIND, valgrind)
   fi
 
-  OPTS="-q --error-exitcode=1 --suppressions=suppressions.valgrind"
+  OPTS="-q --error-exitcode=1 --leak-check=full"
 
   if test -n "$VALGRIND" \
      && $VALGRIND $OPTS $SHELL -c 'exit 0' > /dev/null 2>&1; then
diff --git a/gl/override/m4/valgrind-tests.m4.diff 
b/gl/override/m4/valgrind-tests.m4.diff
deleted file mode 100644
index d94b157..0000000
--- a/gl/override/m4/valgrind-tests.m4.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- valgrind-tests.m4.orig
-+++ valgrind-tests.m4
-@@ -21,7 +21,7 @@ AC_DEFUN([gl_VALGRIND_TESTS],
-     AC_CHECK_PROGS(VALGRIND, valgrind)
-   fi
- 
--  OPTS="-q --error-exitcode=1 --leak-check=full"
-+  OPTS="-q --error-exitcode=1 --suppressions=suppressions.valgrind"
- 
-   if test -n "$VALGRIND" \
-      && $VALGRIND $OPTS $SHELL -c 'exit 0' > /dev/null 2>&1; then
diff --git a/tests/infoaccess.c b/tests/infoaccess.c
index 073e54f..910e1dd 100644
--- a/tests/infoaccess.c
+++ b/tests/infoaccess.c
@@ -231,6 +231,8 @@ doit (void)
     }
   gnutls_free (data.data);
 
+  gnutls_x509_crt_deinit (crt);
+
   gnutls_global_deinit ();
 
 }
diff --git a/tests/mpi.c b/tests/mpi.c
index 70b3ba7..ccc3c0c 100644
--- a/tests/mpi.c
+++ b/tests/mpi.c
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2007-2012 Free Software Foundation, Inc.
  *
- * Author: Simon Josefsson
+ * Author: Nikos Mavrogiannopoulos, Simon Josefsson
  *
  * This file is part of GnuTLS.
  *
@@ -83,5 +83,7 @@ doit (void)
   _gnutls_mpi_release (&n3);
   _gnutls_mpi_release (&n4);
 
+  gnutls_global_deinit ();
+
   if (debug) success ("mpi ops ok\n");
 }
diff --git a/tests/openpgp-auth.c b/tests/openpgp-auth.c
index e71bee8..9787916 100644
--- a/tests/openpgp-auth.c
+++ b/tests/openpgp-auth.c
@@ -266,6 +266,8 @@ doit ()
         }
 
     }
+
+  gnutls_global_deinit ();
 }
 #else
 void
diff --git a/tests/openpgp-auth2.c b/tests/openpgp-auth2.c
index e884ca8..d87f79f 100644
--- a/tests/openpgp-auth2.c
+++ b/tests/openpgp-auth2.c
@@ -249,6 +249,8 @@ doit ()
       else
         fail ("child failed: %d\n", status);
     }
+
+  gnutls_global_deinit ();
 }
 #else
 void
diff --git a/tests/openssl.c b/tests/openssl.c
index 2a31180..a11f9aa 100644
--- a/tests/openssl.c
+++ b/tests/openssl.c
@@ -54,4 +54,6 @@ doit (void)
     }
   else if (debug)
     success ("MD5 OK\n");
+
+  gnutls_global_deinit ();
 }
diff --git a/tests/pkcs12_encode.c b/tests/pkcs12_encode.c
index dc13fc9..3d9e8e6 100644
--- a/tests/pkcs12_encode.c
+++ b/tests/pkcs12_encode.c
@@ -89,7 +89,6 @@ doit (void)
   if (ret < 0)
     error (EXIT_FAILURE, 0, "gnutls_global_init %d", ret);
 
-  gnutls_global_init ();
   gnutls_global_set_log_function (tls_log_func);
   if (debug)
     gnutls_global_set_log_level (4711);
@@ -179,5 +178,4 @@ doit (void)
   gnutls_x509_crt_deinit (client);
   gnutls_x509_crt_deinit (ca);
   gnutls_global_deinit ();
-
 }
diff --git a/tests/rng-fork.c b/tests/rng-fork.c
index 4546007..a977e1d 100644
--- a/tests/rng-fork.c
+++ b/tests/rng-fork.c
@@ -100,6 +100,8 @@ doit (void)
       if(debug)
         success("success\n");
     }
+
+  gnutls_global_deinit ();
 }
 #else
 void


hooks/post-receive
-- 
GNU gnutls