[SCM] GNU gnutls branch, master, updated. gnutls_2_11_6-111-g5d3a7b7

[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=5d3a7b77c44cae6e5c56a1353f98be0b77e8f6ae

The branch, master has been updated
       via  5d3a7b77c44cae6e5c56a1353f98be0b77e8f6ae (commit)
       via  c9f46d967b65dc96bd6edbaf2d7340d0b458aa47 (commit)
      from  5d112546b955935101df4488cb85d0451858837b (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 5d3a7b77c44cae6e5c56a1353f98be0b77e8f6ae
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Mon Feb 7 14:17:50 2011 +0100

    not untested.

commit c9f46d967b65dc96bd6edbaf2d7340d0b458aa47
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Mon Feb 7 14:17:01 2011 +0100

    Set correct iv in GCM.

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

Summary of changes:
 NEWS            |    2 +-
 src/benchmark.c |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index 1fb6119..4efcc49 100644
--- a/NEWS
+++ b/NEWS
@@ -5,7 +5,7 @@ See the end for copying conditions.
 
 * Version 2.99.0 (unreleased)
 
-** libgnutls: Added GCM mode (still untested)
+** libgnutls: Added GCM mode (interoperates with tls.secg.org)
 
 ** libgnutls-extra: Inner application extension was removed.
 It was never standardized nor published as an RFC.
diff --git a/src/benchmark.c b/src/benchmark.c
index d8196d7..1bc0dd8 100644
--- a/src/benchmark.c
+++ b/src/benchmark.c
@@ -194,7 +194,8 @@ cipher_bench (int algo, int size, int aead)
   memset (_iv, 0xf0, blocksize);
 
   iv.data = _iv;
-  iv.size = blocksize;
+  if (aead) iv.size = 12;
+  else iv.size = blocksize;
 
   key.data = _key;
   key.size = keysize;


hooks/post-receive
-- 
GNU gnutls