[SCM] GNU gnutls branch, master, updated. gnutls_3_0_21-55-g7af349a

[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=7af349a1f1f91baca8b7cae2ee3b53d9172bdaa7

The branch, master has been updated
       via  7af349a1f1f91baca8b7cae2ee3b53d9172bdaa7 (commit)
       via  673ae9f69ab57b1e161b92f102af4b0f21ffbdcc (commit)
       via  ec1fd9be88d453ed7bb79756f26d116b826908ae (commit)
      from  8b80cadefce7584097812dd6e9cce683e463bbcc (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 7af349a1f1f91baca8b7cae2ee3b53d9172bdaa7
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Thu Jul 19 20:59:13 2012 +0200

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

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

    Avoid returning from void function. Patch by Rob McMahon.

commit ec1fd9be88d453ed7bb79756f26d116b826908ae
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Wed Jul 18 21:45:27 2012 +0200

    better title

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

Summary of changes:
 doc/cha-tokens.texi   |    2 +-
 lib/nettle/cipher.c   |    4 ++--
 tests/openpgp-auth.c  |    6 ++++--
 tests/openpgp-auth2.c |    6 ++++--
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/doc/cha-tokens.texi b/doc/cha-tokens.texi
index 9ec5164..0ed2c70 100644
--- a/doc/cha-tokens.texi
+++ b/doc/cha-tokens.texi
@@ -383,7 +383,7 @@ can access TPM URLs.
 @showfuncdesc{gnutls_privkey_import_tpm_url}
 @showfuncdesc{gnutls_pubkey_import_tpm_url}
 
address@hidden Listing and accessing keys
address@hidden Listing and deleting keys
 
 The registered keys (that are stored in the TPM) can be listed using one of
 the following functions. Those keys are unfortunately only identified by
diff --git a/lib/nettle/cipher.c b/lib/nettle/cipher.c
index 2a662c7..faf9d78 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