[SCM] GNU gnutls branch, gnutls_3_0_x-2, updated. gnutls_3_0_21_real-5-g88f94e3

[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=88f94e33f313b6b64ddc26d602b2344641a45a86

The branch, gnutls_3_0_x-2 has been updated
       via  88f94e33f313b6b64ddc26d602b2344641a45a86 (commit)
       via  24eaf24df6b82697ba6c24cb1bce973608efc35f (commit)
       via  e576e57600e67b3f7364807fd0d43b5fb9b02de5 (commit)
      from  a1b44f677aff32d6cfc7f494a47b8de86c81fb21 (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 88f94e33f313b6b64ddc26d602b2344641a45a86
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Thu Jul 19 21:01:45 2012 +0200

    Check for /etc/ssl/cert.pem in OpenBSD. Reported by David Woodhouse and 
Mike Miller.

commit 24eaf24df6b82697ba6c24cb1bce973608efc35f
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Thu Jul 19 20:59:13 2012 +0200

    Avoid the usage of alloca(). Reported by Rob McMahon.

commit e576e57600e67b3f7364807fd0d43b5fb9b02de5
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Thu Jul 19 20:57:12 2012 +0200

    Avoid returning from void function. Patch by Rob McMahon.

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

Summary of changes:
 configure.ac          |    3 ++-
 lib/nettle/cipher.c   |    4 ++--
 tests/openpgp-auth.c  |    6 ++++--
 tests/openpgp-auth2.c |    6 ++++--
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/configure.ac b/configure.ac
index 53d263a..a82617d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -305,7 +305,8 @@ if test "x$with_default_trust_store_pkcs11" = x -a 
"x$with_default_trust_store_f
   for i in \
     /etc/ssl/certs/ca-certificates.crt \
     /etc/pki/tls/cert.pem \
-    /usr/local/share/certs/ca-root-nss.crt
+    /usr/local/share/certs/ca-root-nss.crt \
+    /etc/ssl/cert.pem
     do
     if test -e $i; then
       with_default_trust_store_file="$i"
diff --git a/lib/nettle/cipher.c b/lib/nettle/cipher.c
index 1333cae..5bae0f1 100644
--- a/lib/nettle/cipher.c
+++ b/lib/nettle/cipher.c
@@ -90,7 +90,7 @@ static void _gcm_encrypt(void *_ctx, nettle_crypt_func f,
             unsigned length, uint8_t *dst,
             const uint8_t *src)
 {
-  return gcm_aes_encrypt(_ctx, length, dst, src);
+  gcm_aes_encrypt(_ctx, length, dst, src);
 }
 
 static void _gcm_decrypt(void *_ctx, nettle_crypt_func f,  
@@ -98,7 +98,7 @@ static void _gcm_decrypt(void *_ctx, nettle_crypt_func f,
             unsigned length, uint8_t *dst,
             const uint8_t *src)
 {
-  return gcm_aes_decrypt(_ctx, length, dst, src);
+  gcm_aes_decrypt(_ctx, length, dst, src);
 }
 
 static int wrap_nettle_cipher_exists(gnutls_cipher_algorithm_t algo)
diff --git a/tests/openpgp-auth.c b/tests/openpgp-auth.c
index d3e521c..503519a 100644
--- a/tests/openpgp-auth.c
+++ b/tests/openpgp-auth.c
@@ -87,12 +87,12 @@ doit ()
       if (err != 0)
         fail ("socketpair %s\n", strerror (errno));
 
-      pub_key_path = alloca (strlen (srcdir) + strlen (pub_key_file) + 2);
+      pub_key_path = malloc (strlen (srcdir) + strlen (pub_key_file) + 2);
       strcpy (pub_key_path, srcdir);
       strcat (pub_key_path, "/");
       strcat (pub_key_path, pub_key_file);
 
-      priv_key_path = alloca (strlen (srcdir) + strlen (priv_key_file) + 2);
+      priv_key_path = malloc (strlen (srcdir) + strlen (priv_key_file) + 2);
       strcpy (priv_key_path, srcdir);
       strcat (priv_key_path, "/");
       strcat (priv_key_path, priv_key_file);
@@ -267,6 +267,8 @@ doit ()
 
     }
 
+  free(pub_key_path);
+  free(priv_key_path);
   gnutls_global_deinit ();
 }
 #else
diff --git a/tests/openpgp-auth2.c b/tests/openpgp-auth2.c
index 92253fd..8877df5 100644
--- a/tests/openpgp-auth2.c
+++ b/tests/openpgp-auth2.c
@@ -86,12 +86,12 @@ doit ()
   if (err != 0)
     fail ("socketpair %s\n", strerror (errno));
 
-  pub_key_path = alloca (strlen (srcdir) + strlen (pub_key_file) + 2);
+  pub_key_path = malloc (strlen (srcdir) + strlen (pub_key_file) + 2);
   strcpy (pub_key_path, srcdir);
   strcat (pub_key_path, "/");
   strcat (pub_key_path, pub_key_file);
 
-  priv_key_path = alloca (strlen (srcdir) + strlen (priv_key_file) + 2);
+  priv_key_path = malloc (strlen (srcdir) + strlen (priv_key_file) + 2);
   strcpy (priv_key_path, srcdir);
   strcat (priv_key_path, "/");
   strcat (priv_key_path, priv_key_file);
@@ -250,6 +250,8 @@ doit ()
         fail ("child failed: %d\n", status);
     }
 
+  free(pub_key_path);
+  free(priv_key_path);
   gnutls_global_deinit ();
 }
 #else


hooks/post-receive
-- 
GNU gnutls