Add new experimental ciphersuites. Bring naming into line with RFC.
diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c index d7bb6cd..ab0d012 100644 --- a/ssl/s3_lib.c +++ b/ssl/s3_lib.c
@@ -360,8 +360,8 @@ /* Cipher 60 */ { 1, - TLS1_TXT_RSA_EXPORT56_WITH_RC4_56_MD5, - TLS1_CK_RSA_EXPORT56_WITH_RC4_56_MD5, + TLS1_TXT_RSA_EXPORT1024_WITH_RC4_56_MD5, + TLS1_CK_RSA_EXPORT1024_WITH_RC4_56_MD5, SSL_kRSA|SSL_aRSA|SSL_RC4|SSL_MD5|SSL_EXP56|SSL_TLSV1, 0, SSL_ALL_CIPHERS @@ -369,8 +369,8 @@ /* Cipher 61 */ { 1, - TLS1_TXT_RSA_EXPORT56_WITH_RC2_CBC_56_MD5, - TLS1_CK_RSA_EXPORT56_WITH_RC2_CBC_56_MD5, + TLS1_TXT_RSA_EXPORT1024_WITH_RC2_CBC_56_MD5, + TLS1_CK_RSA_EXPORT1024_WITH_RC2_CBC_56_MD5, SSL_kRSA|SSL_aRSA|SSL_RC2|SSL_MD5|SSL_EXP56|SSL_TLSV1, 0, SSL_ALL_CIPHERS @@ -378,12 +378,48 @@ /* Cipher 62 */ { 1, - TLS1_TXT_RSA_EXPORT56_WITH_DES_CBC_SHA, - TLS1_CK_RSA_EXPORT56_WITH_DES_CBC_SHA, + TLS1_TXT_RSA_EXPORT1024_WITH_DES_CBC_SHA, + TLS1_CK_RSA_EXPORT1024_WITH_DES_CBC_SHA, SSL_kRSA|SSL_aRSA|SSL_DES|SSL_SHA|SSL_EXP56|SSL_TLSV1, 0, SSL_ALL_CIPHERS }, + /* Cipher 63 */ + { + 1, + TLS1_TXT_DHE_DSS_EXPORT1024_WITH_DES_CBC_SHA, + TLS1_CK_DHE_DSS_EXPORT1024_WITH_DES_CBC_SHA, + SSL_kEDH|SSL_aDSS|SSL_DES|SSL_SHA|SSL_EXP56|SSL_TLSV1, + 0, + SSL_ALL_CIPHERS + }, + /* Cipher 64 */ + { + 1, + TLS1_TXT_RSA_EXPORT1024_WITH_RC4_56_SHA, + TLS1_CK_RSA_EXPORT1024_WITH_RC4_56_SHA, + SSL_kRSA|SSL_aRSA|SSL_RC4|SSL_SHA|SSL_EXP56|SSL_TLSV1, + 0, + SSL_ALL_CIPHERS + }, + /* Cipher 65 */ + { + 1, + TLS1_TXT_DHE_DSS_EXPORT1024_WITH_RC4_56_SHA, + TLS1_CK_DHE_DSS_EXPORT1024_WITH_RC4_56_SHA, + SSL_kEDH|SSL_aDSS|SSL_RC4|SSL_SHA|SSL_EXP56|SSL_TLSV1, + 0, + SSL_ALL_CIPHERS + }, + /* Cipher 66 */ + { + 1, + TLS1_TXT_DHE_DSS_WITH_RC4_128_SHA, + TLS1_CK_DHE_DSS_WITH_RC4_128_SHA, + SSL_kEDH|SSL_aDSS|SSL_RC4|SSL_SHA|SSL_TLSV1, + 0, + SSL_ALL_CIPHERS + }, #endif /* end of list */