From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Fri, 25 Oct 2013 12:13:27 +0000 (+0200)
Subject: Fixed ciphersuites GNUTLS_ECDHE_ECDSA_CAMELLIA_256_CBC_SHA384 and GNUTLS_ECDHE_RSA_CA... 
X-Git-Tag: gnutls_3_2_6~40
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=de0a130bbefe97fdda758d9c2e4f17f595f439e7;p=thirdparty%2Fgnutls.git

Fixed ciphersuites GNUTLS_ECDHE_ECDSA_CAMELLIA_256_CBC_SHA384 and GNUTLS_ECDHE_RSA_CAMELLIA_256_CBC_SHA384.
---

diff --git a/NEWS b/NEWS
index 2f36dd5060..5f5292e296 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,9 @@ See the end for copying conditions.
 
 ** libgnutls: Added ciphersuite GNUTLS_ECDHE_RSA_AES_256_CBC_SHA384.
 
+** libgnutls: Fixed ciphersuites GNUTLS_ECDHE_ECDSA_CAMELLIA_256_CBC_SHA384,
+and GNUTLS_ECDHE_RSA_CAMELLIA_256_CBC_SHA384.
+
 ** libgnutls: Minimum acceptable DH group parameters were increased to 767
 bits from 727.
 
diff --git a/lib/algorithms/ciphersuites.c b/lib/algorithms/ciphersuites.c
index 7c774e35f4..b571600c09 100644
--- a/lib/algorithms/ciphersuites.c
+++ b/lib/algorithms/ciphersuites.c
@@ -565,7 +565,7 @@ static const gnutls_cipher_suite_entry cs_algorithms[] = {
                              GNUTLS_DTLS_VERSION_MIN),
   ENTRY_PRF (GNUTLS_ECDHE_RSA_CAMELLIA_256_CBC_SHA384,
                              GNUTLS_CIPHER_CAMELLIA_256_CBC, GNUTLS_KX_ECDHE_RSA,
-                             GNUTLS_MAC_SHA256, GNUTLS_TLS1,
+                             GNUTLS_MAC_SHA384, GNUTLS_TLS1,
                              GNUTLS_DTLS_VERSION_MIN, GNUTLS_DIG_SHA384),
 
   /* ECDHE-ECDSA */
@@ -595,7 +595,7 @@ static const gnutls_cipher_suite_entry cs_algorithms[] = {
                              GNUTLS_DTLS_VERSION_MIN),
   ENTRY_PRF (GNUTLS_ECDHE_ECDSA_CAMELLIA_256_CBC_SHA384,
                              GNUTLS_CIPHER_CAMELLIA_256_CBC, GNUTLS_KX_ECDHE_ECDSA,
-                             GNUTLS_MAC_SHA256, GNUTLS_TLS1,
+                             GNUTLS_MAC_SHA384, GNUTLS_TLS1,
                              GNUTLS_DTLS_VERSION_MIN, GNUTLS_DIG_SHA384),
 
   /* More ECC */