From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Sun, 2 Mar 2014 08:51:59 +0000 (+0100)
Subject: Added NULL PSK ciphersuites with SHA1; suggested by Manuel Pégourié-Gonnard.
X-Git-Tag: gnutls_3_3_0pre0~100
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e04aa306710fe3145072d13802b43d95c679ff1e;p=thirdparty%2Fgnutls.git

Added NULL PSK ciphersuites with SHA1; suggested by Manuel Pégourié-Gonnard.
---

diff --git a/lib/algorithms/ciphersuites.c b/lib/algorithms/ciphersuites.c
index 593e7eff05..e40313ebc7 100644
--- a/lib/algorithms/ciphersuites.c
+++ b/lib/algorithms/ciphersuites.c
@@ -222,6 +222,11 @@ typedef struct {
 #define GNUTLS_DHE_PSK_AES_256_CBC_SHA384 { 0x00,0xB3 }
 #define GNUTLS_DHE_PSK_NULL_SHA384        { 0x00,0xB5 }
 
+#define GNUTLS_PSK_NULL_SHA1              { 0x00,0x2C }
+#define GNUTLS_DHE_PSK_NULL_SHA1          { 0x00,0x2D }
+#define GNUTLS_RSA_PSK_NULL_SHA1          { 0x00,0x2E }
+#define GNUTLS_ECDHE_PSK_NULL_SHA1        { 0xC0,0x39 }
+
 #define GNUTLS_RSA_PSK_AES_128_GCM_SHA256 { 0x00,0xAC }
 #define GNUTLS_RSA_PSK_AES_256_GCM_SHA384 { 0x00,0xAD }
 #define GNUTLS_RSA_PSK_AES_128_CBC_SHA256 { 0x00,0xB6 }
@@ -673,6 +678,10 @@ static const gnutls_cipher_suite_entry cs_algorithms[] = {
 	      GNUTLS_CIPHER_ARCFOUR, GNUTLS_KX_ECDHE_PSK,
 	      GNUTLS_MAC_SHA1, GNUTLS_SSL3,
 	      GNUTLS_VERSION_UNKNOWN),
+	ENTRY(GNUTLS_ECDHE_PSK_NULL_SHA1,
+	      GNUTLS_CIPHER_NULL, GNUTLS_KX_ECDHE_PSK,
+	      GNUTLS_MAC_SHA1, GNUTLS_SSL3,
+	      GNUTLS_DTLS_VERSION_MIN),
 	ENTRY(GNUTLS_ECDHE_PSK_NULL_SHA256,
 	      GNUTLS_CIPHER_NULL, GNUTLS_KX_ECDHE_PSK,
 	      GNUTLS_MAC_SHA256, GNUTLS_SSL3,
@@ -739,6 +748,10 @@ static const gnutls_cipher_suite_entry cs_algorithms[] = {
 	      GNUTLS_CIPHER_AES_128_GCM, GNUTLS_KX_PSK,
 	      GNUTLS_MAC_AEAD, GNUTLS_TLS1_2,
 	      GNUTLS_DTLS1_2),
+	ENTRY(GNUTLS_PSK_NULL_SHA1,
+	      GNUTLS_CIPHER_NULL, GNUTLS_KX_PSK,
+	      GNUTLS_MAC_SHA1, GNUTLS_SSL3,
+	      GNUTLS_DTLS_VERSION_MIN),
 	ENTRY(GNUTLS_PSK_NULL_SHA256,
 	      GNUTLS_CIPHER_NULL, GNUTLS_KX_PSK,
 	      GNUTLS_MAC_SHA256, GNUTLS_SSL3,
@@ -805,6 +818,10 @@ static const gnutls_cipher_suite_entry cs_algorithms[] = {
 	      GNUTLS_CIPHER_AES_128_CBC, GNUTLS_KX_RSA_PSK,
 	      GNUTLS_MAC_SHA256, GNUTLS_SSL3,
 	      GNUTLS_DTLS_VERSION_MIN),
+	ENTRY(GNUTLS_RSA_PSK_NULL_SHA1,
+	      GNUTLS_CIPHER_NULL, GNUTLS_KX_RSA_PSK,
+	      GNUTLS_MAC_SHA1, GNUTLS_SSL3,
+	      GNUTLS_DTLS_VERSION_MIN),
 	ENTRY(GNUTLS_RSA_PSK_NULL_SHA256,
 	      GNUTLS_CIPHER_NULL, GNUTLS_KX_RSA_PSK,
 	      GNUTLS_MAC_SHA256, GNUTLS_SSL3,
@@ -856,6 +873,10 @@ static const gnutls_cipher_suite_entry cs_algorithms[] = {
 	      GNUTLS_CIPHER_AES_128_GCM, GNUTLS_KX_DHE_PSK,
 	      GNUTLS_MAC_AEAD, GNUTLS_TLS1_2,
 	      GNUTLS_DTLS1_2),
+	ENTRY(GNUTLS_DHE_PSK_NULL_SHA1,
+	      GNUTLS_CIPHER_NULL, GNUTLS_KX_DHE_PSK,
+	      GNUTLS_MAC_SHA1, GNUTLS_SSL3,
+	      GNUTLS_DTLS_VERSION_MIN),
 	ENTRY(GNUTLS_DHE_PSK_NULL_SHA256,
 	      GNUTLS_CIPHER_NULL, GNUTLS_KX_DHE_PSK,
 	      GNUTLS_MAC_SHA256, GNUTLS_SSL3,