renamed ARCFOUR-EXPORT to ARCFOUR-40

8 files changed, 14 insertions, 14 deletions

diff --git a/doc/tex/ciphers.tex b/doc/tex/ciphers.tex
index 12506a9b05..d6188b216d 100644
--- a/doc/tex/ciphers.tex
+++ b/doc/tex/ciphers.tex
@@ -23,7 +23,7 @@ encryption (EDE). Has 64 bits block size and is used in CBC mode.
 ARCFOUR & ARCFOUR is a fast stream cipher.
 \\
 \hline
-ARCFOUR\_EXPORT & This is the ARCFOUR cipher that is fed with a 40 bit key,
+ARCFOUR\_40 & This is the ARCFOUR cipher that is fed with a 40 bit key,
 which is considered weak.
 \\
 \hline
diff --git a/lib/gnutls.h.in.in b/lib/gnutls.h.in.in
index ec889d93fc..5797885f74 100644
--- a/lib/gnutls.h.in.in
+++ b/lib/gnutls.h.in.in
@@ -38,7 +38,7 @@ extern "C" {
 typedef enum GNUTLS_BulkCipherAlgorithm { GNUTLS_CIPHER_NULL=1, 
 	GNUTLS_CIPHER_ARCFOUR, GNUTLS_CIPHER_3DES_CBC, GNUTLS_CIPHER_RIJNDAEL_128_CBC, 
 	GNUTLS_CIPHER_TWOFISH_128_CBC, GNUTLS_CIPHER_RIJNDAEL_256_CBC,
-	GNUTLS_CIPHER_ARCFOUR_EXPORT
+	GNUTLS_CIPHER_ARCFOUR_40
 } GNUTLS_BulkCipherAlgorithm;
 
 typedef enum GNUTLS_KXAlgorithm { GNUTLS_KX_RSA=1, GNUTLS_KX_DHE_DSS, 
diff --git a/lib/gnutls_algorithms.c b/lib/gnutls_algorithms.c
index f8d5ec7402..da430a4da7 100644
--- a/lib/gnutls_algorithms.c
+++ b/lib/gnutls_algorithms.c
@@ -96,7 +96,7 @@ static const gnutls_cipher_entry algorithms[] = {
 	{"RIJNDAEL 256 CBC", GNUTLS_CIPHER_RIJNDAEL_256_CBC, 16, 32, CIPHER_BLOCK, 16, 0 },
 	{"TWOFISH 128 CBC", GNUTLS_CIPHER_TWOFISH_128_CBC, 16, 16, CIPHER_BLOCK, 16, 0 },
 	{"ARCFOUR 128", GNUTLS_CIPHER_ARCFOUR, 1, 16, CIPHER_STREAM, 0, 0 },
-	{"ARCFOUR 40", GNUTLS_CIPHER_ARCFOUR_EXPORT, 1, 5, CIPHER_STREAM, 0, 1 },
+	{"ARCFOUR 40", GNUTLS_CIPHER_ARCFOUR_40, 1, 5, CIPHER_STREAM, 0, 1 },
 	{"NULL", GNUTLS_CIPHER_NULL, 1, 0, CIPHER_STREAM, 0, 0 },
 	{0}
 };
@@ -246,7 +246,7 @@ typedef struct {
 #define GNUTLS_RSA_ARCFOUR_MD5 { 0x00, 0x04 }
 #define GNUTLS_RSA_3DES_EDE_CBC_SHA { 0x00, 0x0A }
 
-#define GNUTLS_RSA_EXPORT_ARCFOUR_EXPORT_MD5 { 0x00, 0x03 }
+#define GNUTLS_RSA_EXPORT_ARCFOUR_40_MD5 { 0x00, 0x03 }
 
 /* draft-ietf-tls-ciphersuite-05: 
  */
@@ -366,8 +366,8 @@ static const gnutls_cipher_suite_entry cs_algorithms[] = {
 				  GNUTLS_CIPHER_NULL,
 				  GNUTLS_KX_RSA, GNUTLS_MAC_MD5, GNUTLS_SSL3),
 
-	GNUTLS_CIPHER_SUITE_ENTRY(GNUTLS_RSA_EXPORT_ARCFOUR_EXPORT_MD5,
-				  GNUTLS_CIPHER_ARCFOUR_EXPORT,
+	GNUTLS_CIPHER_SUITE_ENTRY(GNUTLS_RSA_EXPORT_ARCFOUR_40_MD5,
+				  GNUTLS_CIPHER_ARCFOUR_40,
 				  GNUTLS_KX_RSA_EXPORT, GNUTLS_MAC_MD5, GNUTLS_SSL3),
 
 	GNUTLS_CIPHER_SUITE_ENTRY(GNUTLS_RSA_ARCFOUR_SHA,
diff --git a/lib/gnutls_cipher_int.c b/lib/gnutls_cipher_int.c
index 65e1aec03c..dba463736b 100644
--- a/lib/gnutls_cipher_int.c
+++ b/lib/gnutls_cipher_int.c
@@ -61,7 +61,7 @@ GNUTLS_CIPHER_HANDLE ret;
 #endif
 		break;
 	case GNUTLS_CIPHER_ARCFOUR:
-	case GNUTLS_CIPHER_ARCFOUR_EXPORT:
+	case GNUTLS_CIPHER_ARCFOUR_40:
 #ifdef USE_MCRYPT
 		ret = mcrypt_module_open( "arcfour", NULL, "stream", NULL);
 #else
diff --git a/lib/gnutls_int.h b/lib/gnutls_int.h
index d6c9b857b5..628b20eb57 100644
--- a/lib/gnutls_int.h
+++ b/lib/gnutls_int.h
@@ -157,7 +157,7 @@ typedef enum ConnectionEnd { GNUTLS_SERVER=1, GNUTLS_CLIENT
 typedef enum BulkCipherAlgorithm { GNUTLS_CIPHER_NULL=1, 
 	GNUTLS_CIPHER_ARCFOUR, GNUTLS_CIPHER_3DES_CBC, GNUTLS_CIPHER_RIJNDAEL_128_CBC, 
 	GNUTLS_CIPHER_TWOFISH_128_CBC, GNUTLS_CIPHER_RIJNDAEL_256_CBC,
-	GNUTLS_CIPHER_ARCFOUR_EXPORT
+	GNUTLS_CIPHER_ARCFOUR_40
 } BulkCipherAlgorithm;
 #define GNUTLS_BulkCipherAlgorithm BulkCipherAlgorithm
 	
diff --git a/src/cli.c b/src/cli.c
index 382c2f6bb5..1813edd45d 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -77,7 +77,7 @@ int kx_priority[16] =
    GNUTLS_KX_ANON_DH, GNUTLS_KX_RSA_EXPORT, 0
 };
 int cipher_priority[16] =
-    { GNUTLS_CIPHER_ARCFOUR_EXPORT, GNUTLS_CIPHER_RIJNDAEL_128_CBC, GNUTLS_CIPHER_3DES_CBC,
+    { GNUTLS_CIPHER_ARCFOUR_40, GNUTLS_CIPHER_RIJNDAEL_128_CBC, GNUTLS_CIPHER_3DES_CBC,
    GNUTLS_CIPHER_ARCFOUR, 0
 };
 int comp_priority[16] = { GNUTLS_COMP_ZLIB, GNUTLS_COMP_NULL, 0 };
@@ -556,8 +556,8 @@ void gaa_parser(int argc, char **argv)
 	    cipher_priority[j++] = GNUTLS_CIPHER_TWOFISH_128_CBC;
 	 if (strncasecmp(info.ciphers[i], "3DE", 3) == 0)
 	    cipher_priority[j++] = GNUTLS_CIPHER_3DES_CBC;
-	 if (strcasecmp(info.ciphers[i], "ARCFOUR-EXPORT") == 0)
-	    cipher_priority[j++] = GNUTLS_CIPHER_ARCFOUR_EXPORT;
+	 if (strcasecmp(info.ciphers[i], "ARCFOUR-40") == 0)
+	    cipher_priority[j++] = GNUTLS_CIPHER_ARCFOUR_40;
 	 if (strcasecmp(info.ciphers[i], "ARCFOUR") == 0)
 	    cipher_priority[j++] = GNUTLS_CIPHER_ARCFOUR;
 	 if (strncasecmp(info.ciphers[i], "NUL", 3) == 0)
diff --git a/src/serv.c b/src/serv.c
index b1f7b4bba3..c04ac9da2b 100644
--- a/src/serv.c
+++ b/src/serv.c
@@ -241,7 +241,7 @@ int kx_priority[16] =
 };
 int cipher_priority[16] =
     { GNUTLS_CIPHER_RIJNDAEL_128_CBC, GNUTLS_CIPHER_3DES_CBC,
-   GNUTLS_CIPHER_ARCFOUR, GNUTLS_CIPHER_ARCFOUR_EXPORT, 0
+   GNUTLS_CIPHER_ARCFOUR, GNUTLS_CIPHER_ARCFOUR_40, 0
 };
 
 int comp_priority[16] = { GNUTLS_COMP_ZLIB, GNUTLS_COMP_NULL, 0 };
@@ -297,7 +297,7 @@ char* peer_print_info(GNUTLS_STATE state, int *ret_length, const char* header)
    const char *tmp;
    unsigned char sesid[32];
    int sesid_size, i;
-   char* http_buffer = malloc(5*1024);
+   char* http_buffer = malloc(5*1024 + strlen(header));
 
    if (http_buffer==NULL) return NULL;
    if (quiet != 0) {
diff --git a/src/tests.c b/src/tests.c
index e35ea7b031..3604de8ca3 100644
--- a/src/tests.c
+++ b/src/tests.c
@@ -85,7 +85,7 @@ const static int kx_priority[16] =
     { GNUTLS_KX_RSA, GNUTLS_KX_DHE_DSS, GNUTLS_KX_DHE_RSA, GNUTLS_KX_ANON_DH, 
     GNUTLS_KX_RSA_EXPORT, 0 };
 const static int cipher_priority[16] =
-    { GNUTLS_CIPHER_3DES_CBC, GNUTLS_CIPHER_ARCFOUR, GNUTLS_CIPHER_ARCFOUR_EXPORT, 0 };
+    { GNUTLS_CIPHER_3DES_CBC, GNUTLS_CIPHER_ARCFOUR, GNUTLS_CIPHER_ARCFOUR_40, 0 };
 const static int comp_priority[16] = { GNUTLS_COMP_NULL, 0 };
 const static int mac_priority[16] = { GNUTLS_MAC_SHA, GNUTLS_MAC_MD5, 0 };
 const static int cert_type_priority[16] = { GNUTLS_CRT_X509, 0 };