path: root/patches/source/openssl/openssl0/openssl.no.weak.sslv3.ciphers.diff

diff -u -r --new-file openssl-0.9.8zh.orig/ssl/s3_lib.c openssl-0.9.8zh/ssl/s3_lib.c
--- openssl-0.9.8zh.orig/ssl/s3_lib.c	2015-12-03 08:59:08.000000000 -0600
+++ openssl-0.9.8zh/ssl/s3_lib.c	2016-03-01 18:42:26.295095103 -0600
@@ -166,6 +166,7 @@
      SSL_ALL_STRENGTHS,
      },
 /* Cipher 03 */
+# if 0
     {
      1,
      SSL3_TXT_RSA_RC4_40_MD5,
@@ -178,6 +179,7 @@
      SSL_ALL_CIPHERS,
      SSL_ALL_STRENGTHS,
      },
+# endif
 /* Cipher 04 */
     {
      1,
@@ -205,6 +207,7 @@
      SSL_ALL_STRENGTHS,
      },
 /* Cipher 06 */
+# if 0
     {
      1,
      SSL3_TXT_RSA_RC2_40_MD5,
@@ -217,6 +220,7 @@
      SSL_ALL_CIPHERS,
      SSL_ALL_STRENGTHS,
      },
+# endif
 /* Cipher 07 */
 #ifndef OPENSSL_NO_IDEA
     {
@@ -233,6 +237,7 @@
      },
 #endif
 /* Cipher 08 */
+# if 0
     {
      1,
      SSL3_TXT_RSA_DES_40_CBC_SHA,
@@ -245,7 +250,9 @@
      SSL_ALL_CIPHERS,
      SSL_ALL_STRENGTHS,
      },
+# endif
 /* Cipher 09 */
+# if 0
     {
      1,
      SSL3_TXT_RSA_DES_64_CBC_SHA,
@@ -258,6 +265,7 @@
      SSL_ALL_CIPHERS,
      SSL_ALL_STRENGTHS,
      },
+# endif
 /* Cipher 0A */
     {
      1,
@@ -273,6 +281,7 @@
      },
 /* The DH ciphers */
 /* Cipher 0B */
+# if 0
     {
      0,
      SSL3_TXT_DH_DSS_DES_40_CBC_SHA,
@@ -285,7 +294,9 @@
      SSL_ALL_CIPHERS,
      SSL_ALL_STRENGTHS,
      },
+# endif
 /* Cipher 0C */
+# if 0
     {
      0,
      SSL3_TXT_DH_DSS_DES_64_CBC_SHA,
@@ -298,6 +309,7 @@
      SSL_ALL_CIPHERS,
      SSL_ALL_STRENGTHS,
      },
+# endif
 /* Cipher 0D */
     {
      0,
@@ -312,6 +324,7 @@
      SSL_ALL_STRENGTHS,
      },
 /* Cipher 0E */
+# if 0
     {
      0,
      SSL3_TXT_DH_RSA_DES_40_CBC_SHA,
@@ -324,7 +337,9 @@
      SSL_ALL_CIPHERS,
      SSL_ALL_STRENGTHS,
      },
+# endif
 /* Cipher 0F */
+# if 0
     {
      0,
      SSL3_TXT_DH_RSA_DES_64_CBC_SHA,
@@ -337,6 +352,7 @@
      SSL_ALL_CIPHERS,
      SSL_ALL_STRENGTHS,
      },
+# endif
 /* Cipher 10 */
     {
      0,
@@ -353,6 +369,7 @@
 
 /* The Ephemeral DH ciphers */
 /* Cipher 11 */
+# if 0
     {
      1,
      SSL3_TXT_EDH_DSS_DES_40_CBC_SHA,
@@ -365,7 +382,9 @@
      SSL_ALL_CIPHERS,
      SSL_ALL_STRENGTHS,
      },
+# endif
 /* Cipher 12 */
+# if 0
     {
      1,
      SSL3_TXT_EDH_DSS_DES_64_CBC_SHA,
@@ -378,6 +397,7 @@
      SSL_ALL_CIPHERS,
      SSL_ALL_STRENGTHS,
      },
+# endif
 /* Cipher 13 */
     {
      1,
@@ -392,6 +412,7 @@
      SSL_ALL_STRENGTHS,
      },
 /* Cipher 14 */
+# if 0
     {
      1,
      SSL3_TXT_EDH_RSA_DES_40_CBC_SHA,
@@ -404,7 +425,9 @@
      SSL_ALL_CIPHERS,
      SSL_ALL_STRENGTHS,
      },
+# endif
 /* Cipher 15 */
+# if 0
     {
      1,
      SSL3_TXT_EDH_RSA_DES_64_CBC_SHA,
@@ -417,6 +440,7 @@
      SSL_ALL_CIPHERS,
      SSL_ALL_STRENGTHS,
      },
+# endif
 /* Cipher 16 */
     {
      1,
@@ -431,6 +455,7 @@
      SSL_ALL_STRENGTHS,
      },
 /* Cipher 17 */
+# if 0
     {
      1,
      SSL3_TXT_ADH_RC4_40_MD5,
@@ -443,6 +468,7 @@
      SSL_ALL_CIPHERS,
      SSL_ALL_STRENGTHS,
      },
+# endif
 /* Cipher 18 */
     {
      1,
@@ -457,6 +483,7 @@
      SSL_ALL_STRENGTHS,
      },
 /* Cipher 19 */
+# if 0
     {
      1,
      SSL3_TXT_ADH_DES_40_CBC_SHA,
@@ -469,7 +496,9 @@
      SSL_ALL_CIPHERS,
      SSL_ALL_STRENGTHS,
      },
+# endif
 /* Cipher 1A */
+# if 0
     {
      1,
      SSL3_TXT_ADH_DES_64_CBC_SHA,
@@ -482,6 +511,7 @@
      SSL_ALL_CIPHERS,
      SSL_ALL_STRENGTHS,
      },
+# endif
 /* Cipher 1B */
     {
      1,
@@ -543,6 +573,7 @@
 
 #ifndef OPENSSL_NO_KRB5
 /* The Kerberos ciphers */
+# if 0
 /* Cipher 1E */
     {
      1,
@@ -556,6 +587,7 @@
      SSL_ALL_CIPHERS,
      SSL_ALL_STRENGTHS,
      },
+# endif
 
 /* Cipher 1F */
     {
@@ -600,6 +632,7 @@
      },
 
 /* Cipher 22 */
+# if 0
     {
      1,
      SSL3_TXT_KRB5_DES_64_CBC_MD5,
@@ -612,6 +645,7 @@
      SSL_ALL_CIPHERS,
      SSL_ALL_STRENGTHS,
      },
+# endif
 
 /* Cipher 23 */
     {
@@ -656,6 +690,7 @@
      },
 
 /* Cipher 26 */
+# if 0
     {
      1,
      SSL3_TXT_KRB5_DES_40_CBC_SHA,
@@ -668,8 +703,10 @@
      SSL_ALL_CIPHERS,
      SSL_ALL_STRENGTHS,
      },
+# endif
 
 /* Cipher 27 */
+# if 0
     {
      1,
      SSL3_TXT_KRB5_RC2_40_CBC_SHA,
@@ -682,8 +719,10 @@
      SSL_ALL_CIPHERS,
      SSL_ALL_STRENGTHS,
      },
+# endif
 
 /* Cipher 28 */
+# if 0
     {
      1,
      SSL3_TXT_KRB5_RC4_40_SHA,
@@ -696,8 +735,10 @@
      SSL_ALL_CIPHERS,
      SSL_ALL_STRENGTHS,
      },
+# endif
 
 /* Cipher 29 */
+# if 0
     {
      1,
      SSL3_TXT_KRB5_DES_40_CBC_MD5,
@@ -710,8 +751,10 @@
      SSL_ALL_CIPHERS,
      SSL_ALL_STRENGTHS,
      },
+# endif
 
 /* Cipher 2A */
+# if 0
     {
      1,
      SSL3_TXT_KRB5_RC2_40_CBC_MD5,
@@ -724,8 +767,10 @@
      SSL_ALL_CIPHERS,
      SSL_ALL_STRENGTHS,
      },
+# endif
 
 /* Cipher 2B */
+# if 0
     {
      1,
      SSL3_TXT_KRB5_RC4_40_MD5,
@@ -738,6 +783,7 @@
      SSL_ALL_CIPHERS,
      SSL_ALL_STRENGTHS,
      },
+# endif
 #endif                          /* OPENSSL_NO_KRB5 */
 
 /* New AES ciphersuites */
@@ -1007,6 +1053,7 @@
      },
 # endif
     /* Cipher 62 */
+# if 0
     {
      1,
      TLS1_TXT_RSA_EXPORT1024_WITH_DES_CBC_SHA,
@@ -1019,7 +1066,9 @@
      SSL_ALL_CIPHERS,
      SSL_ALL_STRENGTHS,
      },
+# endif
     /* Cipher 63 */
+# if 0
     {
      1,
      TLS1_TXT_DHE_DSS_EXPORT1024_WITH_DES_CBC_SHA,
@@ -1032,7 +1081,9 @@
      SSL_ALL_CIPHERS,
      SSL_ALL_STRENGTHS,
      },
+# endif
     /* Cipher 64 */
+# if 0
     {
      1,
      TLS1_TXT_RSA_EXPORT1024_WITH_RC4_56_SHA,
@@ -1045,7 +1096,9 @@
      SSL_ALL_CIPHERS,
      SSL_ALL_STRENGTHS,
      },
+# endif
     /* Cipher 65 */
+# if 0
     {
      1,
      TLS1_TXT_DHE_DSS_EXPORT1024_WITH_RC4_56_SHA,
@@ -1058,6 +1111,7 @@
      SSL_ALL_CIPHERS,
      SSL_ALL_STRENGTHS,
      },
+# endif
     /* Cipher 66 */
     {
      1,