1 files changed, 0 insertions, 169 deletions
diff --git a/lib/libssl/s3_lib.c b/lib/libssl/s3_lib.c
index 288d885d9ec..7833779f6b0 100644
--- a/lib/libssl/s3_lib.c
+++ b/lib/libssl/s3_lib.c
@@ -605,58 +605,6 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[] = {
 		168,
 		168,
 	},
-
-/* Fortezza ciphersuite from SSL 3.0 spec */
-#if 0
-/* Cipher 1C */
-	{
-		0,
-		SSL3_TXT_FZA_DMS_NULL_SHA,
-		SSL3_CK_FZA_DMS_NULL_SHA,
-		SSL_kFZA,
-		SSL_aFZA,
-		SSL_eNULL,
-		SSL_SHA1,
-		SSL_SSLV3,
-		SSL_NOT_EXP|SSL_STRONG_NONE,
-		SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
-		0,
-		0,
-	},
-
-/* Cipher 1D */
-	{
-		0,
-		SSL3_TXT_FZA_DMS_FZA_SHA,
-		SSL3_CK_FZA_DMS_FZA_SHA,
-		SSL_kFZA,
-		SSL_aFZA,
-		SSL_eFZA,
-		SSL_SHA1,
-		SSL_SSLV3,
-		SSL_NOT_EXP|SSL_STRONG_NONE,
-		SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
-		0,
-		0,
-	},
-
-/* Cipher 1E */
-	{
-		0,
-		SSL3_TXT_FZA_DMS_RC4_SHA,
-		SSL3_CK_FZA_DMS_RC4_SHA,
-		SSL_kFZA,
-		SSL_aFZA,
-		SSL_RC4,
-		SSL_SHA1,
-		SSL_SSLV3,
-		SSL_NOT_EXP|SSL_MEDIUM,
-		SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
-		128,
-		128,
-	},
-#endif
-
 #ifndef OPENSSL_NO_KRB5
 /* The Kerberos ciphers*/
 /* Cipher 1E */
@@ -1268,123 +1216,6 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[] = {
 	},
 #endif /* OPENSSL_NO_CAMELLIA */
 
-#if TLS1_ALLOW_EXPERIMENTAL_CIPHERSUITES
-	/* New TLS Export CipherSuites from expired ID */
-#if 0
-	/* Cipher 60 */
-	{
-		1,
-		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_TLSV1,
-		SSL_EXPORT|SSL_EXP56,
-		SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
-		56,
-		128,
-	},
-
-	/* Cipher 61 */
-	{
-		1,
-		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_TLSV1,
-		SSL_EXPORT|SSL_EXP56,
-		SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
-		56,
-		128,
-	},
-#endif
-
-	/* Cipher 62 */
-	{
-		1,
-		TLS1_TXT_RSA_EXPORT1024_WITH_DES_CBC_SHA,
-		TLS1_CK_RSA_EXPORT1024_WITH_DES_CBC_SHA,
-		SSL_kRSA,
-		SSL_aRSA,
-		SSL_DES,
-		SSL_SHA1,
-		SSL_TLSV1,
-		SSL_EXPORT|SSL_EXP56,
-		SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
-		56,
-		56,
-	},
-
-	/* 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_SHA1,
-		SSL_TLSV1,
-		SSL_EXPORT|SSL_EXP56,
-		SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
-		56,
-		56,
-	},
-
-	/* 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_SHA1,
-		SSL_TLSV1,
-		SSL_EXPORT|SSL_EXP56,
-		SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
-		56,
-		128,
-	},
-
-	/* 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_SHA1,
-		SSL_TLSV1,
-		SSL_EXPORT|SSL_EXP56,
-		SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
-		56,
-		128,
-	},
-
-	/* 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_SHA1,
-		SSL_TLSV1,
-		SSL_NOT_EXP|SSL_MEDIUM,
-		SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
-		128,
-		128,
-	},
-#endif
-
 	/* TLS v1.2 ciphersuites */
 	/* Cipher 67 */
 	{