[SCM] GNU gnutls branch, master, updated. gnutls_3_0_9-9-ge943839

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

The branch, master has been updated
       via  e943839de12ca459e298136af445f697de07d300 (commit)
       via  8ae1c77186010f4b3c6fc298cf6843c640413e88 (commit)
      from  3f5986af3abc524198e18687e865131a6cde57e9 (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 e943839de12ca459e298136af445f697de07d300
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Mon Dec 19 01:16:43 2011 +0100

    Added ciphersuites: GNUTLS_PSK_WITH_AES_256_GCM_SHA384 and 
GNUTLS_DHE_PSK_WITH_AES_256_GCM_SHA384.

commit 8ae1c77186010f4b3c6fc298cf6843c640413e88
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Mon Dec 19 01:10:16 2011 +0100

    Corrected ciphersuite GNUTLS_ECDHE_PSK_AES_256_CBC_SHA384

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

Summary of changes:
 NEWS                          |   11 +++++++++++
 lib/algorithms/ciphersuites.c |   13 +++++++++++--
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index c56c38e..499281b 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,17 @@ GnuTLS NEWS -- History of user-visible changes.                
-*- outline -*-
 Copyright (C) 2000-2011 Free Software Foundation, Inc.
 See the end for copying conditions.
 
+* Version 3.0.10 (unreleased)
+
+** libgnutls: Corrected ciphersuite GNUTLS_ECDHE_PSK_AES_256_CBC_SHA384
+
+** libgnutls: Added ciphersuites: GNUTLS_PSK_WITH_AES_256_GCM_SHA384
+and GNUTLS_DHE_PSK_WITH_AES_256_GCM_SHA384.
+
+** API and ABI modifications:
+No changes since last version.
+
+
 * Version 3.0.9 (released 2011-12-13)
 
 ** certtool: Added new parameter --dh-info.
diff --git a/lib/algorithms/ciphersuites.c b/lib/algorithms/ciphersuites.c
index 7b90a37..8924d4c 100644
--- a/lib/algorithms/ciphersuites.c
+++ b/lib/algorithms/ciphersuites.c
@@ -167,6 +167,8 @@ typedef struct
 /* GCM-PSK */
 #define GNUTLS_PSK_AES_128_GCM_SHA256 { 0x00, 0xA8 }
 #define GNUTLS_DHE_PSK_AES_128_GCM_SHA256 { 0x00, 0xAA }
+#define GNUTLS_PSK_WITH_AES_256_GCM_SHA384 { 0x00, 0xA9 }
+#define GNUTLS_DHE_PSK_WITH_AES_256_GCM_SHA384 { 0x00, 0xAB }
 
 /* PSK - SHA256 HMAC */
 #define GNUTLS_PSK_AES_128_CBC_SHA256 { 0x00, 0xAE }
@@ -586,7 +588,7 @@ static const gnutls_cipher_suite_entry cs_algorithms[] = {
                              GNUTLS_MAC_SHA256, GNUTLS_TLS1_0,
                              GNUTLS_VERSION_MAX, 1),
   ENTRY_PRF (GNUTLS_ECDHE_PSK_AES_256_CBC_SHA384,
-                             GNUTLS_CIPHER_AES_128_CBC, GNUTLS_KX_ECDHE_PSK,
+                             GNUTLS_CIPHER_AES_256_CBC, GNUTLS_KX_ECDHE_PSK,
                              GNUTLS_MAC_SHA384, GNUTLS_TLS1_0,
                              GNUTLS_VERSION_MAX, 1, GNUTLS_MAC_SHA384),
   ENTRY (GNUTLS_ECDHE_PSK_NULL_SHA256,
@@ -609,7 +611,14 @@ static const gnutls_cipher_suite_entry cs_algorithms[] = {
                                 GNUTLS_CIPHER_AES_256_CBC, 
GNUTLS_KX_ECDHE_ECDSA,
                                 GNUTLS_MAC_SHA384, GNUTLS_TLS1_2,
                                 GNUTLS_VERSION_MAX, 1, GNUTLS_DIG_SHA384),
-
+  ENTRY_PRF(GNUTLS_PSK_WITH_AES_256_GCM_SHA384,
+                                GNUTLS_CIPHER_AES_256_GCM, GNUTLS_KX_PSK,
+                                GNUTLS_MAC_AEAD, GNUTLS_TLS1_2,
+                                GNUTLS_VERSION_MAX, 1, GNUTLS_DIG_SHA384),
+  ENTRY_PRF(GNUTLS_DHE_PSK_WITH_AES_256_GCM_SHA384,
+                                GNUTLS_CIPHER_AES_256_GCM, GNUTLS_KX_DHE_PSK,
+                                GNUTLS_MAC_AEAD, GNUTLS_TLS1_2,
+                                GNUTLS_VERSION_MAX, 1, GNUTLS_DIG_SHA384),
   {0, {0, 0}, 0, 0, 0, 0, 0, 0}
 };
 


hooks/post-receive
-- 
GNU gnutls