|
 |
3a273b |
diff -up openssl-1.1.1/ssl/s3_lib.c.weak-ciphers openssl-1.1.1/ssl/s3_lib.c
|
|
|
3a273b |
--- openssl-1.1.1/ssl/s3_lib.c.weak-ciphers 2018-09-11 14:48:23.000000000 +0200
|
|
|
3a273b |
+++ openssl-1.1.1/ssl/s3_lib.c 2018-09-17 12:53:33.850637181 +0200
|
|
|
3a273b |
@@ -2612,7 +2612,7 @@ static SSL_CIPHER ssl3_ciphers[] = {
|
|
|
3a273b |
SSL_GOST89MAC,
|
|
|
3a273b |
TLS1_VERSION, TLS1_2_VERSION,
|
|
|
3a273b |
0, 0,
|
|
|
3a273b |
- SSL_HIGH,
|
|
|
3a273b |
+ SSL_MEDIUM,
|
|
|
3a273b |
SSL_HANDSHAKE_MAC_GOST94 | TLS1_PRF_GOST94 | TLS1_STREAM_MAC,
|
|
|
3a273b |
256,
|
|
|
3a273b |
256,
|
|
|
3a273b |
@@ -2644,7 +2644,7 @@ static SSL_CIPHER ssl3_ciphers[] = {
|
|
|
3a273b |
SSL_GOST89MAC12,
|
|
|
3a273b |
TLS1_VERSION, TLS1_2_VERSION,
|
|
|
3a273b |
0, 0,
|
|
|
3a273b |
- SSL_HIGH,
|
|
|
3a273b |
+ SSL_MEDIUM,
|
|
|
3a273b |
SSL_HANDSHAKE_MAC_GOST12_256 | TLS1_PRF_GOST12_256 | TLS1_STREAM_MAC,
|
|
|
3a273b |
256,
|
|
|
3a273b |
256,
|
|
|
3a273b |
@@ -2753,7 +2753,7 @@ static SSL_CIPHER ssl3_ciphers[] = {
|
|
|
3a273b |
},
|
|
|
3a273b |
#endif /* OPENSSL_NO_SEED */
|
|
|
3a273b |
|
|
|
3a273b |
-#ifndef OPENSSL_NO_WEAK_SSL_CIPHERS
|
|
|
3a273b |
+#if 0 /* No MD5 ciphersuites */
|
|
|
3a273b |
{
|
|
|
3a273b |
1,
|
|
|
3a273b |
SSL3_TXT_RSA_RC4_128_MD5,
|
|
|
3a273b |
@@ -2770,6 +2770,8 @@ static SSL_CIPHER ssl3_ciphers[] = {
|
|
|
3a273b |
128,
|
|
|
3a273b |
128,
|
|
|
3a273b |
},
|
|
|
3a273b |
+#endif
|
|
|
3a273b |
+#ifndef OPENSSL_NO_WEAK_SSL_CIPHERS
|
|
|
3a273b |
{
|
|
|
3a273b |
1,
|
|
|
3a273b |
SSL3_TXT_RSA_RC4_128_SHA,
|
|
|
3a273b |
@@ -2786,6 +2788,8 @@ static SSL_CIPHER ssl3_ciphers[] = {
|
|
|
3a273b |
128,
|
|
|
3a273b |
128,
|
|
|
3a273b |
},
|
|
|
3a273b |
+#endif
|
|
|
3a273b |
+#if 0
|
|
|
3a273b |
{
|
|
|
3a273b |
1,
|
|
|
3a273b |
SSL3_TXT_ADH_RC4_128_MD5,
|
|
|
3a273b |
@@ -2802,6 +2806,8 @@ static SSL_CIPHER ssl3_ciphers[] = {
|
|
|
3a273b |
128,
|
|
|
3a273b |
128,
|
|
|
3a273b |
},
|
|
|
3a273b |
+#endif
|
|
|
3a273b |
+#ifndef OPENSSL_NO_WEAK_SSL_CIPHERS
|
|
|
3a273b |
{
|
|
|
3a273b |
1,
|
|
|
3a273b |
TLS1_TXT_ECDHE_PSK_WITH_RC4_128_SHA,
|