Ciphersuites with ARCFOUR in name were renamed to ARCFOUR_128

diff --git a/lib/algorithms/ciphersuites.c b/lib/algorithms/ciphersuites.c
index b571600c0983759a051213cb0510ec7689fb3231..ba92acd57076cfa0046054f960bbc821972c7ac2 100644 (file)
--- a/lib/algorithms/ciphersuites.c
+++ b/lib/algorithms/ciphersuites.c
@@ -56,7 +56,7 @@ typedef struct
  */
 
 #define GNUTLS_DH_ANON_3DES_EDE_CBC_SHA1 { 0x00, 0x1B }
-#define GNUTLS_DH_ANON_ARCFOUR_MD5 { 0x00, 0x18 }
+#define GNUTLS_DH_ANON_ARCFOUR_128_MD5 { 0x00, 0x18 }
 
  /* rfc3268: */
 #define GNUTLS_DH_ANON_AES_128_CBC_SHA1 { 0x00, 0x34 }
@@ -115,17 +115,17 @@ typedef struct
 /* PSK (not in TLS 1.0)
  * draft-ietf-tls-psk:
  */
-#define GNUTLS_PSK_SHA_ARCFOUR_SHA1 { 0x00, 0x8A }
+#define GNUTLS_PSK_SHA_ARCFOUR_128_SHA1 { 0x00, 0x8A }
 #define GNUTLS_PSK_SHA_3DES_EDE_CBC_SHA1 { 0x00, 0x8B }
 #define GNUTLS_PSK_SHA_AES_128_CBC_SHA1 { 0x00, 0x8C }
 #define GNUTLS_PSK_SHA_AES_256_CBC_SHA1 { 0x00, 0x8D }
 
-#define GNUTLS_DHE_PSK_SHA_ARCFOUR_SHA1 { 0x00, 0x8E }
+#define GNUTLS_DHE_PSK_SHA_ARCFOUR_128_SHA1 { 0x00, 0x8E }
 #define GNUTLS_DHE_PSK_SHA_3DES_EDE_CBC_SHA1 { 0x00, 0x8F }
 #define GNUTLS_DHE_PSK_SHA_AES_128_CBC_SHA1 { 0x00, 0x90 }
 #define GNUTLS_DHE_PSK_SHA_AES_256_CBC_SHA1 { 0x00, 0x91 }
 
-#define GNUTLS_RSA_PSK_SHA_ARCFOUR_SHA1 { 0x00, 0x92 }
+#define GNUTLS_RSA_PSK_SHA_ARCFOUR_128_SHA1 { 0x00, 0x92 }
 #define GNUTLS_RSA_PSK_SHA_3DES_EDE_CBC_SHA1 { 0x00, 0x93 }
 #define GNUTLS_RSA_PSK_SHA_AES_128_CBC_SHA1 { 0x00, 0x94 }
 #define GNUTLS_RSA_PSK_SHA_AES_256_CBC_SHA1 { 0x00, 0x95 }
@@ -146,8 +146,8 @@ typedef struct
 
 /* RSA
  */
-#define GNUTLS_RSA_ARCFOUR_SHA1 { 0x00, 0x05 }
-#define GNUTLS_RSA_ARCFOUR_MD5 { 0x00, 0x04 }
+#define GNUTLS_RSA_ARCFOUR_128_SHA1 { 0x00, 0x05 }
+#define GNUTLS_RSA_ARCFOUR_128_MD5 { 0x00, 0x04 }
 #define GNUTLS_RSA_3DES_EDE_CBC_SHA1 { 0x00, 0x0A }
 
 /* rfc3268:
@@ -169,7 +169,7 @@ typedef struct
 
 /* draft-ietf-tls-56-bit-ciphersuites-01:
  */
-#define GNUTLS_DHE_DSS_ARCFOUR_SHA1 { 0x00, 0x66 }
+#define GNUTLS_DHE_DSS_ARCFOUR_128_SHA1 { 0x00, 0x66 }
 
 
 /* rfc3268:
@@ -327,11 +327,11 @@ static const gnutls_cipher_suite_entry cs_algorithms[] = {
                              GNUTLS_DTLS1_2),
 
   /* RSA */
-  ENTRY (GNUTLS_RSA_ARCFOUR_SHA1,
+  ENTRY (GNUTLS_RSA_ARCFOUR_128_SHA1,
                              GNUTLS_CIPHER_ARCFOUR_128,
                              GNUTLS_KX_RSA, GNUTLS_MAC_SHA1, GNUTLS_SSL3,
                              GNUTLS_VERSION_UNKNOWN),
-  ENTRY (GNUTLS_RSA_ARCFOUR_MD5,
+  ENTRY (GNUTLS_RSA_ARCFOUR_128_MD5,
                              GNUTLS_CIPHER_ARCFOUR_128,
                              GNUTLS_KX_RSA, GNUTLS_MAC_MD5, GNUTLS_SSL3,
                              GNUTLS_VERSION_UNKNOWN),
@@ -411,7 +411,7 @@ static const gnutls_cipher_suite_entry cs_algorithms[] = {
 
   /* DHE_DSS */
 #ifdef ENABLE_DHE
-  ENTRY (GNUTLS_DHE_DSS_ARCFOUR_SHA1,
+  ENTRY (GNUTLS_DHE_DSS_ARCFOUR_128_SHA1,
                              GNUTLS_CIPHER_ARCFOUR_128, GNUTLS_KX_DHE_DSS,
                              GNUTLS_MAC_SHA1, GNUTLS_TLS1,
                              GNUTLS_VERSION_UNKNOWN),
@@ -743,7 +743,7 @@ static const gnutls_cipher_suite_entry cs_algorithms[] = {
                GNUTLS_DTLS_VERSION_MIN),
 
   /* PSK */
-  ENTRY (GNUTLS_PSK_SHA_ARCFOUR_SHA1,
+  ENTRY (GNUTLS_PSK_SHA_ARCFOUR_128_SHA1,
                              GNUTLS_CIPHER_ARCFOUR, GNUTLS_KX_PSK,
                              GNUTLS_MAC_SHA1, GNUTLS_TLS1,
                              GNUTLS_VERSION_UNKNOWN),
@@ -821,7 +821,7 @@ static const gnutls_cipher_suite_entry cs_algorithms[] = {
                 GNUTLS_DTLS_VERSION_MIN, GNUTLS_DIG_SHA384),
 
   /* RSA-PSK */
-  ENTRY (GNUTLS_RSA_PSK_SHA_ARCFOUR_SHA1,
+  ENTRY (GNUTLS_RSA_PSK_SHA_ARCFOUR_128_SHA1,
         GNUTLS_CIPHER_ARCFOUR, GNUTLS_KX_RSA_PSK,
         GNUTLS_MAC_SHA1, GNUTLS_TLS1,
         GNUTLS_VERSION_UNKNOWN),
@@ -882,7 +882,7 @@ static const gnutls_cipher_suite_entry cs_algorithms[] = {
 
 
   /* DHE-PSK */
-  ENTRY (GNUTLS_DHE_PSK_SHA_ARCFOUR_SHA1,
+  ENTRY (GNUTLS_DHE_PSK_SHA_ARCFOUR_128_SHA1,
                              GNUTLS_CIPHER_ARCFOUR, GNUTLS_KX_DHE_PSK,
                              GNUTLS_MAC_SHA1, GNUTLS_TLS1,
                              GNUTLS_VERSION_UNKNOWN),
@@ -941,7 +941,7 @@ static const gnutls_cipher_suite_entry cs_algorithms[] = {
 #endif
 #ifdef ENABLE_ANON
   /* DH_ANON */
-  ENTRY (GNUTLS_DH_ANON_ARCFOUR_MD5,
+  ENTRY (GNUTLS_DH_ANON_ARCFOUR_128_MD5,
                              GNUTLS_CIPHER_ARCFOUR_128,
                              GNUTLS_KX_ANON_DH, GNUTLS_MAC_MD5,
                              GNUTLS_SSL3, GNUTLS_VERSION_UNKNOWN),