[SCM] GNU gnutls branch, gnutls_3_0_x, updated. gnutls_3_0_0-130-g3d58546

[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=3d58546350c48781f72df1153d87d0dedccbdb57

The branch, gnutls_3_0_x has been updated
       via  3d58546350c48781f72df1153d87d0dedccbdb57 (commit)
       via  972eee8cba6ba84b968933757d4a0b013705c6ab (commit)
      from  9c93acec60e0bd9e3e7622bd1a9d9e3efb03be6e (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 3d58546350c48781f72df1153d87d0dedccbdb57
Merge: 9c93ace 972eee8
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Mon Aug 15 22:39:19 2011 +0200

    Merge branch 'master' into gnutls_3_0_x

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

Summary of changes:
 NEWS                     |    3 +++
 lib/algorithms/ciphers.c |    1 +
 2 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/NEWS b/NEWS
index 47a0fbc..35de9df 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,9 @@ See the end for copying conditions.
 
 * Version 3.0.1 (unreleased)
 
+** libgnutls: Added AES-256-GCM which was left out from
+the previous release. Reported by Benjamin Hof.
+
 ** libgnutls: When asking for a PIN multiple times, the
 flags in the callback were not being updated to reflect
 for PIN low count or final try.
diff --git a/lib/algorithms/ciphers.c b/lib/algorithms/ciphers.c
index 446d0d1..198844f 100644
--- a/lib/algorithms/ciphers.c
+++ b/lib/algorithms/ciphers.c
@@ -50,6 +50,7 @@ static const gnutls_cipher_entry algorithms[] = {
   {"AES-192-CBC", GNUTLS_CIPHER_AES_192_CBC, 16, 24, CIPHER_BLOCK, 16, 0, 0},
   {"AES-128-CBC", GNUTLS_CIPHER_AES_128_CBC, 16, 16, CIPHER_BLOCK, 16, 0, 0},
   {"AES-128-GCM", GNUTLS_CIPHER_AES_128_GCM, 16, 16, CIPHER_STREAM, 
AEAD_IMPLICIT_DATA_SIZE, 0, 1},
+  {"AES-256-GCM", GNUTLS_CIPHER_AES_256_GCM, 16, 32, CIPHER_STREAM, 
AEAD_IMPLICIT_DATA_SIZE, 0, 1},
   {"3DES-CBC", GNUTLS_CIPHER_3DES_CBC, 8, 24, CIPHER_BLOCK, 8, 0, 0},
   {"DES-CBC", GNUTLS_CIPHER_DES_CBC, 8, 8, CIPHER_BLOCK, 8, 0, 0},
   {"ARCFOUR-128", GNUTLS_CIPHER_ARCFOUR_128, 1, 16, CIPHER_STREAM, 0, 0, 0},


hooks/post-receive
-- 
GNU gnutls