From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Sun, 24 Nov 2013 13:59:38 +0000 (+0100)
Subject: removed the UMAC96 ciphersuites
X-Git-Tag: gnutls_3_3_0pre0~540
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=277bc208ebdf227940ea7418cf14fb286f2056ad;p=thirdparty%2Fgnutls.git

removed the UMAC96 ciphersuites
---

diff --git a/lib/algorithms/ciphersuites.c b/lib/algorithms/ciphersuites.c
index b9637d71f6..478dd61f83 100644
--- a/lib/algorithms/ciphersuites.c
+++ b/lib/algorithms/ciphersuites.c
@@ -296,18 +296,6 @@ typedef struct {
 #define GNUTLS_ECDHE_PSK_ESTREAM_SALSA20_256_SHA1 {0xE4, 0x18}
 #define GNUTLS_ECDHE_PSK_SALSA20_256_SHA1        {0xE4, 0x19}
 
-#define GNUTLS_RSA_ESTREAM_SALSA20_256_UMAC96      {0xE4, 0x30}
-#define GNUTLS_RSA_SALSA20_256_UMAC96              {0xE4, 0x31}
-#define GNUTLS_ECDHE_RSA_ESTREAM_SALSA20_256_UMAC96 {0xE4, 0x32}
-#define GNUTLS_ECDHE_RSA_SALSA20_256_UMAC96        {0xE4, 0x33}
-#define GNUTLS_ECDHE_ECDSA_ESTREAM_SALSA20_256_UMAC96 {0xE4, 0x34}
-#define GNUTLS_ECDHE_ECDSA_SALSA20_256_UMAC96      {0xE4, 0x35}
-#define GNUTLS_PSK_ESTREAM_SALSA20_256_UMAC96      {0xE4, 0x36}
-#define GNUTLS_PSK_SALSA20_256_UMAC96              {0xE4, 0x37}
-#define GNUTLS_ECDHE_PSK_ESTREAM_SALSA20_256_UMAC96 {0xE4, 0x38}
-#define GNUTLS_ECDHE_PSK_SALSA20_256_UMAC96        {0xE4, 0x39}
-
-
 #define CIPHER_SUITES_COUNT (sizeof(cs_algorithms)/sizeof(gnutls_cipher_suite_entry)-1)
 
 static const gnutls_cipher_suite_entry cs_algorithms[] = {
@@ -394,19 +382,11 @@ static const gnutls_cipher_suite_entry cs_algorithms[] = {
 	      GNUTLS_CIPHER_SALSA20_256, GNUTLS_KX_RSA,
 	      GNUTLS_MAC_SHA1, GNUTLS_SSL3,
 	      GNUTLS_DTLS_VERSION_MIN),
-	ENTRY(GNUTLS_RSA_SALSA20_256_UMAC96,
-	      GNUTLS_CIPHER_SALSA20_256, GNUTLS_KX_RSA,
-	      GNUTLS_MAC_UMAC_96, GNUTLS_SSL3,
-	      GNUTLS_DTLS_VERSION_MIN),
 
 	ENTRY(GNUTLS_RSA_ESTREAM_SALSA20_256_SHA1,
 	      GNUTLS_CIPHER_ESTREAM_SALSA20_256, GNUTLS_KX_RSA,
 	      GNUTLS_MAC_SHA1, GNUTLS_SSL3,
 	      GNUTLS_DTLS_VERSION_MIN),
-	ENTRY(GNUTLS_RSA_ESTREAM_SALSA20_256_UMAC96,
-	      GNUTLS_CIPHER_ESTREAM_SALSA20_256, GNUTLS_KX_RSA,
-	      GNUTLS_MAC_UMAC_96, GNUTLS_SSL3,
-	      GNUTLS_DTLS_VERSION_MIN),
 
 	/* DHE_DSS */
 #ifdef ENABLE_DHE
@@ -650,35 +630,19 @@ static const gnutls_cipher_suite_entry cs_algorithms[] = {
 	      GNUTLS_CIPHER_SALSA20_256, GNUTLS_KX_ECDHE_RSA,
 	      GNUTLS_MAC_SHA1, GNUTLS_SSL3,
 	      GNUTLS_DTLS_VERSION_MIN),
-	ENTRY(GNUTLS_ECDHE_RSA_SALSA20_256_UMAC96,
-	      GNUTLS_CIPHER_SALSA20_256, GNUTLS_KX_ECDHE_RSA,
-	      GNUTLS_MAC_UMAC_96, GNUTLS_SSL3,
-	      GNUTLS_DTLS_VERSION_MIN),
 	ENTRY(GNUTLS_ECDHE_ECDSA_SALSA20_256_SHA1,
 	      GNUTLS_CIPHER_SALSA20_256, GNUTLS_KX_ECDHE_ECDSA,
 	      GNUTLS_MAC_SHA1, GNUTLS_SSL3,
 	      GNUTLS_DTLS_VERSION_MIN),
-	ENTRY(GNUTLS_ECDHE_ECDSA_SALSA20_256_UMAC96,
-	      GNUTLS_CIPHER_SALSA20_256, GNUTLS_KX_ECDHE_ECDSA,
-	      GNUTLS_MAC_UMAC_96, GNUTLS_SSL3,
-	      GNUTLS_DTLS_VERSION_MIN),
 
 	ENTRY(GNUTLS_ECDHE_RSA_ESTREAM_SALSA20_256_SHA1,
 	      GNUTLS_CIPHER_ESTREAM_SALSA20_256, GNUTLS_KX_ECDHE_RSA,
 	      GNUTLS_MAC_SHA1, GNUTLS_SSL3,
 	      GNUTLS_DTLS_VERSION_MIN),
-	ENTRY(GNUTLS_ECDHE_RSA_ESTREAM_SALSA20_256_UMAC96,
-	      GNUTLS_CIPHER_ESTREAM_SALSA20_256, GNUTLS_KX_ECDHE_RSA,
-	      GNUTLS_MAC_UMAC_96, GNUTLS_SSL3,
-	      GNUTLS_DTLS_VERSION_MIN),
 	ENTRY(GNUTLS_ECDHE_ECDSA_ESTREAM_SALSA20_256_SHA1,
 	      GNUTLS_CIPHER_ESTREAM_SALSA20_256, GNUTLS_KX_ECDHE_ECDSA,
 	      GNUTLS_MAC_SHA1, GNUTLS_SSL3,
 	      GNUTLS_DTLS_VERSION_MIN),
-	ENTRY(GNUTLS_ECDHE_ECDSA_ESTREAM_SALSA20_256_UMAC96,
-	      GNUTLS_CIPHER_ESTREAM_SALSA20_256, GNUTLS_KX_ECDHE_ECDSA,
-	      GNUTLS_MAC_UMAC_96, GNUTLS_SSL3,
-	      GNUTLS_DTLS_VERSION_MIN),
 #endif
 #ifdef ENABLE_PSK
 	/* ECC - PSK */
@@ -727,19 +691,11 @@ static const gnutls_cipher_suite_entry cs_algorithms[] = {
 	      GNUTLS_CIPHER_SALSA20_256, GNUTLS_KX_ECDHE_PSK,
 	      GNUTLS_MAC_SHA1, GNUTLS_SSL3,
 	      GNUTLS_DTLS_VERSION_MIN),
-	ENTRY(GNUTLS_ECDHE_PSK_SALSA20_256_UMAC96,
-	      GNUTLS_CIPHER_SALSA20_256, GNUTLS_KX_ECDHE_PSK,
-	      GNUTLS_MAC_UMAC_96, GNUTLS_SSL3,
-	      GNUTLS_DTLS_VERSION_MIN),
 
 	ENTRY(GNUTLS_ECDHE_PSK_ESTREAM_SALSA20_256_SHA1,
 	      GNUTLS_CIPHER_ESTREAM_SALSA20_256, GNUTLS_KX_ECDHE_PSK,
 	      GNUTLS_MAC_SHA1, GNUTLS_SSL3,
 	      GNUTLS_DTLS_VERSION_MIN),
-	ENTRY(GNUTLS_ECDHE_PSK_ESTREAM_SALSA20_256_UMAC96,
-	      GNUTLS_CIPHER_ESTREAM_SALSA20_256, GNUTLS_KX_ECDHE_PSK,
-	      GNUTLS_MAC_UMAC_96, GNUTLS_SSL3,
-	      GNUTLS_DTLS_VERSION_MIN),
 
 	/* PSK */
 	ENTRY(GNUTLS_PSK_ARCFOUR_128_SHA1,
@@ -797,19 +753,11 @@ static const gnutls_cipher_suite_entry cs_algorithms[] = {
 	      GNUTLS_CIPHER_SALSA20_256, GNUTLS_KX_PSK,
 	      GNUTLS_MAC_SHA1, GNUTLS_SSL3,
 	      GNUTLS_DTLS_VERSION_MIN),
-	ENTRY(GNUTLS_PSK_SALSA20_256_UMAC96,
-	      GNUTLS_CIPHER_SALSA20_256, GNUTLS_KX_PSK,
-	      GNUTLS_MAC_UMAC_96, GNUTLS_SSL3,
-	      GNUTLS_DTLS_VERSION_MIN),
 
 	ENTRY(GNUTLS_PSK_ESTREAM_SALSA20_256_SHA1,
 	      GNUTLS_CIPHER_ESTREAM_SALSA20_256, GNUTLS_KX_PSK,
 	      GNUTLS_MAC_SHA1, GNUTLS_SSL3,
 	      GNUTLS_DTLS_VERSION_MIN),
-	ENTRY(GNUTLS_PSK_ESTREAM_SALSA20_256_UMAC96,
-	      GNUTLS_CIPHER_ESTREAM_SALSA20_256, GNUTLS_KX_PSK,
-	      GNUTLS_MAC_UMAC_96, GNUTLS_SSL3,
-	      GNUTLS_DTLS_VERSION_MIN),
 	ENTRY_PRF(GNUTLS_PSK_AES_256_CBC_SHA384,
 		  GNUTLS_CIPHER_AES_256_CBC, GNUTLS_KX_PSK,
 		  GNUTLS_MAC_SHA384, GNUTLS_TLS1,