|
 |
653b37 |
We degrade all 64 bit block ciphers and RC4 to 112 bits.
|
|
|
2b5643 |
diff -up openssl-1.0.1e/ssl/s2_lib.c.3des-strength openssl-1.0.1e/ssl/s2_lib.c
|
|
|
2b5643 |
--- openssl-1.0.1e/ssl/s2_lib.c.3des-strength 2013-02-11 16:26:04.000000000 +0100
|
|
|
653b37 |
+++ openssl-1.0.1e/ssl/s2_lib.c 2016-09-21 11:37:22.729563320 +0200
|
|
|
653b37 |
@@ -152,7 +152,7 @@ OPENSSL_GLOBAL const SSL_CIPHER ssl2_cip
|
|
|
653b37 |
SSL_SSLV2,
|
|
|
653b37 |
SSL_NOT_EXP|SSL_MEDIUM,
|
|
|
653b37 |
0,
|
|
|
653b37 |
- 128,
|
|
|
653b37 |
+ 112,
|
|
|
653b37 |
128,
|
|
|
653b37 |
},
|
|
|
653b37 |
|
|
|
653b37 |
@@ -184,7 +184,7 @@ OPENSSL_GLOBAL const SSL_CIPHER ssl2_cip
|
|
|
653b37 |
SSL_SSLV2,
|
|
|
653b37 |
SSL_NOT_EXP|SSL_MEDIUM,
|
|
|
653b37 |
0,
|
|
|
653b37 |
- 128,
|
|
|
653b37 |
+ 112,
|
|
|
653b37 |
128,
|
|
|
653b37 |
},
|
|
|
653b37 |
|
|
|
653b37 |
@@ -217,7 +217,7 @@ OPENSSL_GLOBAL const SSL_CIPHER ssl2_cip
|
|
|
653b37 |
SSL_SSLV2,
|
|
|
653b37 |
SSL_NOT_EXP|SSL_MEDIUM,
|
|
|
653b37 |
0,
|
|
|
653b37 |
- 128,
|
|
|
653b37 |
+ 112,
|
|
|
653b37 |
128,
|
|
|
653b37 |
},
|
|
|
653b37 |
#endif
|
|
|
653b37 |
|
|
|
2b5643 |
@@ -250,7 +250,7 @@ OPENSSL_GLOBAL const SSL_CIPHER ssl2_cip
|
|
|
2b5643 |
SSL_SSLV2,
|
|
|
2b5643 |
SSL_NOT_EXP|SSL_HIGH,
|
|
|
2b5643 |
0,
|
|
|
2b5643 |
- 168,
|
|
|
653b37 |
+ 112,
|
|
|
2b5643 |
168,
|
|
|
2b5643 |
},
|
|
|
2b5643 |
|
|
|
2b5643 |
diff -up openssl-1.0.1e/ssl/s3_lib.c.3des-strength openssl-1.0.1e/ssl/s3_lib.c
|
|
|
653b37 |
--- openssl-1.0.1e/ssl/s3_lib.c.3des-strength 2013-02-11 16:26:04.000000000 +0100
|
|
|
653b37 |
+++ openssl-1.0.1e/ssl/s3_lib.c 2016-09-21 11:43:27.108247849 +0200
|
|
|
653b37 |
@@ -230,7 +230,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]
|
|
|
653b37 |
SSL_SSLV3,
|
|
|
653b37 |
SSL_NOT_EXP|SSL_MEDIUM,
|
|
|
653b37 |
SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
|
|
|
653b37 |
- 128,
|
|
|
653b37 |
+ 112,
|
|
|
653b37 |
128,
|
|
|
653b37 |
},
|
|
|
653b37 |
|
|
|
653b37 |
@@ -246,7 +246,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]
|
|
|
653b37 |
SSL_SSLV3,
|
|
|
653b37 |
SSL_NOT_EXP|SSL_MEDIUM,
|
|
|
653b37 |
SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
|
|
|
653b37 |
- 128,
|
|
|
653b37 |
+ 112,
|
|
|
653b37 |
128,
|
|
|
653b37 |
},
|
|
|
653b37 |
|
|
|
653b37 |
@@ -279,7 +279,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]
|
|
|
653b37 |
SSL_SSLV3,
|
|
|
653b37 |
SSL_NOT_EXP|SSL_MEDIUM,
|
|
|
653b37 |
SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
|
|
|
653b37 |
- 128,
|
|
|
653b37 |
+ 112,
|
|
|
653b37 |
128,
|
|
|
653b37 |
},
|
|
|
653b37 |
#endif
|
|
|
2b5643 |
@@ -328,7 +328,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]
|
|
|
2b5643 |
SSL_SSLV3,
|
|
|
2b5643 |
SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
|
|
|
2b5643 |
SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
|
|
|
2b5643 |
- 168,
|
|
|
653b37 |
+ 112,
|
|
|
2b5643 |
168,
|
|
|
2b5643 |
},
|
|
|
2b5643 |
|
|
|
2b5643 |
@@ -377,7 +377,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]
|
|
|
2b5643 |
SSL_SSLV3,
|
|
|
2b5643 |
SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
|
|
|
2b5643 |
SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
|
|
|
2b5643 |
- 168,
|
|
|
653b37 |
+ 112,
|
|
|
2b5643 |
168,
|
|
|
2b5643 |
},
|
|
|
2b5643 |
|
|
|
2b5643 |
@@ -425,7 +425,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]
|
|
|
2b5643 |
SSL_SSLV3,
|
|
|
2b5643 |
SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
|
|
|
2b5643 |
SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
|
|
|
2b5643 |
- 168,
|
|
|
653b37 |
+ 112,
|
|
|
2b5643 |
168,
|
|
|
2b5643 |
},
|
|
|
2b5643 |
|
|
|
2b5643 |
@@ -474,7 +474,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]
|
|
|
2b5643 |
SSL_SSLV3,
|
|
|
2b5643 |
SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
|
|
|
2b5643 |
SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
|
|
|
2b5643 |
- 168,
|
|
|
653b37 |
+ 112,
|
|
|
2b5643 |
168,
|
|
|
2b5643 |
},
|
|
|
2b5643 |
|
|
|
2b5643 |
@@ -522,7 +522,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]
|
|
|
2b5643 |
SSL_SSLV3,
|
|
|
2b5643 |
SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
|
|
|
2b5643 |
SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
|
|
|
2b5643 |
- 168,
|
|
|
653b37 |
+ 112,
|
|
|
2b5643 |
168,
|
|
|
2b5643 |
},
|
|
|
2b5643 |
|
|
|
653b37 |
@@ -554,7 +554,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]
|
|
|
653b37 |
SSL_SSLV3,
|
|
|
653b37 |
SSL_NOT_EXP|SSL_MEDIUM,
|
|
|
653b37 |
SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
|
|
|
653b37 |
- 128,
|
|
|
653b37 |
+ 112,
|
|
|
653b37 |
128,
|
|
|
653b37 |
},
|
|
|
653b37 |
|
|
|
2b5643 |
@@ -602,7 +602,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]
|
|
|
2b5643 |
SSL_SSLV3,
|
|
|
2b5643 |
SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
|
|
|
2b5643 |
SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
|
|
|
2b5643 |
- 168,
|
|
|
653b37 |
+ 112,
|
|
|
2b5643 |
168,
|
|
|
2b5643 |
},
|
|
|
2b5643 |
|
|
|
2b5643 |
@@ -687,7 +687,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]
|
|
|
2b5643 |
SSL_SSLV3,
|
|
|
2b5643 |
SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
|
|
|
2b5643 |
SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
|
|
|
2b5643 |
- 168,
|
|
|
653b37 |
+ 112,
|
|
|
2b5643 |
168,
|
|
|
2b5643 |
},
|
|
|
2b5643 |
|
|
|
653b37 |
@@ -703,7 +703,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]
|
|
|
653b37 |
SSL_SSLV3,
|
|
|
653b37 |
SSL_NOT_EXP|SSL_MEDIUM,
|
|
|
653b37 |
SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
|
|
|
653b37 |
- 128,
|
|
|
653b37 |
+ 112,
|
|
|
653b37 |
128,
|
|
|
653b37 |
},
|
|
|
653b37 |
|
|
|
653b37 |
@@ -719,7 +719,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]
|
|
|
653b37 |
SSL_SSLV3,
|
|
|
653b37 |
SSL_NOT_EXP|SSL_MEDIUM,
|
|
|
653b37 |
SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
|
|
|
653b37 |
- 128,
|
|
|
653b37 |
+ 112,
|
|
|
653b37 |
128,
|
|
|
653b37 |
},
|
|
|
653b37 |
|
|
|
2b5643 |
@@ -751,7 +751,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]
|
|
|
2b5643 |
SSL_SSLV3,
|
|
|
2b5643 |
SSL_NOT_EXP|SSL_HIGH,
|
|
|
2b5643 |
SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
|
|
|
2b5643 |
- 168,
|
|
|
653b37 |
+ 112,
|
|
|
2b5643 |
168,
|
|
|
2b5643 |
},
|
|
|
2b5643 |
|
|
|
653b37 |
@@ -767,7 +767,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]
|
|
|
653b37 |
SSL_SSLV3,
|
|
|
653b37 |
SSL_NOT_EXP|SSL_MEDIUM,
|
|
|
653b37 |
SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
|
|
|
653b37 |
- 128,
|
|
|
653b37 |
+ 112,
|
|
|
653b37 |
128,
|
|
|
653b37 |
},
|
|
|
653b37 |
|
|
|
653b37 |
@@ -783,7 +783,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]
|
|
|
653b37 |
SSL_SSLV3,
|
|
|
653b37 |
SSL_NOT_EXP|SSL_MEDIUM,
|
|
|
653b37 |
SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
|
|
|
653b37 |
- 128,
|
|
|
653b37 |
+ 112,
|
|
|
653b37 |
128,
|
|
|
653b37 |
},
|
|
|
653b37 |
|
|
|
653b37 |
@@ -1380,7 +1380,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]
|
|
|
653b37 |
SSL_TLSV1,
|
|
|
653b37 |
SSL_NOT_EXP|SSL_MEDIUM,
|
|
|
653b37 |
SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
|
|
|
653b37 |
- 128,
|
|
|
653b37 |
+ 112,
|
|
|
653b37 |
128,
|
|
|
653b37 |
},
|
|
|
653b37 |
#endif
|
|
|
653b37 |
@@ -1669,7 +1669,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]
|
|
|
653b37 |
SSL_TLSV1,
|
|
|
653b37 |
SSL_NOT_EXP|SSL_MEDIUM,
|
|
|
653b37 |
SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
|
|
|
653b37 |
- 128,
|
|
|
653b37 |
+ 112,
|
|
|
653b37 |
128,
|
|
|
653b37 |
},
|
|
|
653b37 |
|
|
|
2b5643 |
@@ -1685,7 +1685,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]
|
|
|
2b5643 |
SSL_TLSV1,
|
|
|
2b5643 |
SSL_NOT_EXP|SSL_HIGH,
|
|
|
2b5643 |
SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
|
|
|
2b5643 |
- 168,
|
|
|
653b37 |
+ 112,
|
|
|
2b5643 |
168,
|
|
|
2b5643 |
},
|
|
|
2b5643 |
|
|
|
653b37 |
@@ -2046,7 +2046,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]
|
|
|
653b37 |
SSL_TLSV1,
|
|
|
653b37 |
SSL_NOT_EXP|SSL_MEDIUM,
|
|
|
653b37 |
SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
|
|
|
653b37 |
- 128,
|
|
|
653b37 |
+ 112,
|
|
|
653b37 |
128,
|
|
|
653b37 |
},
|
|
|
653b37 |
|
|
|
2b5643 |
@@ -2062,7 +2062,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]
|
|
|
2b5643 |
SSL_TLSV1,
|
|
|
2b5643 |
SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
|
|
|
2b5643 |
SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
|
|
|
2b5643 |
- 168,
|
|
|
653b37 |
+ 112,
|
|
|
2b5643 |
168,
|
|
|
2b5643 |
},
|
|
|
2b5643 |
|
|
|
653b37 |
@@ -2126,7 +2126,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]
|
|
|
653b37 |
SSL_TLSV1,
|
|
|
653b37 |
SSL_NOT_EXP|SSL_MEDIUM,
|
|
|
653b37 |
SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
|
|
|
653b37 |
- 128,
|
|
|
653b37 |
+ 112,
|
|
|
653b37 |
128,
|
|
|
653b37 |
},
|
|
|
653b37 |
|
|
|
2b5643 |
@@ -2142,7 +2142,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]
|
|
|
2b5643 |
SSL_TLSV1,
|
|
|
2b5643 |
SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
|
|
|
2b5643 |
SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
|
|
|
2b5643 |
- 168,
|
|
|
653b37 |
+ 112,
|
|
|
2b5643 |
168,
|
|
|
2b5643 |
},
|
|
|
2b5643 |
|
|
|
653b37 |
@@ -2206,7 +2206,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]
|
|
|
653b37 |
SSL_TLSV1,
|
|
|
653b37 |
SSL_NOT_EXP|SSL_MEDIUM,
|
|
|
653b37 |
SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
|
|
|
653b37 |
- 128,
|
|
|
653b37 |
+ 112,
|
|
|
653b37 |
128,
|
|
|
653b37 |
},
|
|
|
653b37 |
|
|
|
2b5643 |
@@ -2222,7 +2222,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]
|
|
|
2b5643 |
SSL_TLSV1,
|
|
|
2b5643 |
SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
|
|
|
2b5643 |
SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
|
|
|
2b5643 |
- 168,
|
|
|
653b37 |
+ 112,
|
|
|
2b5643 |
168,
|
|
|
2b5643 |
},
|
|
|
2b5643 |
|
|
|
653b37 |
@@ -2286,7 +2286,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]
|
|
|
653b37 |
SSL_TLSV1,
|
|
|
653b37 |
SSL_NOT_EXP|SSL_MEDIUM,
|
|
|
653b37 |
SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
|
|
|
653b37 |
- 128,
|
|
|
653b37 |
+ 112,
|
|
|
653b37 |
128,
|
|
|
653b37 |
},
|
|
|
653b37 |
|
|
|
2b5643 |
@@ -2302,7 +2302,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]
|
|
|
2b5643 |
SSL_TLSV1,
|
|
|
2b5643 |
SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
|
|
|
2b5643 |
SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
|
|
|
2b5643 |
- 168,
|
|
|
653b37 |
+ 112,
|
|
|
2b5643 |
168,
|
|
|
2b5643 |
},
|
|
|
2b5643 |
|
|
|
653b37 |
@@ -2366,7 +2366,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]
|
|
|
653b37 |
SSL_TLSV1,
|
|
|
653b37 |
SSL_NOT_EXP|SSL_MEDIUM,
|
|
|
653b37 |
SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
|
|
|
653b37 |
- 128,
|
|
|
653b37 |
+ 112,
|
|
|
653b37 |
128,
|
|
|
653b37 |
},
|
|
|
653b37 |
|
|
|
2b5643 |
@@ -2382,7 +2382,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]
|
|
|
2b5643 |
SSL_TLSV1,
|
|
|
2b5643 |
SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
|
|
|
2b5643 |
SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
|
|
|
2b5643 |
- 168,
|
|
|
653b37 |
+ 112,
|
|
|
2b5643 |
168,
|
|
|
2b5643 |
},
|
|
|
2b5643 |
|
|
|
2b5643 |
@@ -2432,7 +2432,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]
|
|
|
2b5643 |
SSL_TLSV1,
|
|
|
2b5643 |
SSL_NOT_EXP|SSL_HIGH,
|
|
|
2b5643 |
SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
|
|
|
2b5643 |
- 168,
|
|
|
653b37 |
+ 112,
|
|
|
2b5643 |
168,
|
|
|
2b5643 |
},
|
|
|
2b5643 |
|
|
|
2b5643 |
@@ -2448,7 +2448,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]
|
|
|
2b5643 |
SSL_TLSV1,
|
|
|
2b5643 |
SSL_NOT_EXP|SSL_HIGH,
|
|
|
2b5643 |
SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
|
|
|
2b5643 |
- 168,
|
|
|
653b37 |
+ 112,
|
|
|
2b5643 |
168,
|
|
|
2b5643 |
},
|
|
|
2b5643 |
|
|
|
2b5643 |
@@ -2464,7 +2464,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]
|
|
|
2b5643 |
SSL_TLSV1,
|
|
|
2b5643 |
SSL_NOT_EXP|SSL_HIGH,
|
|
|
2b5643 |
SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
|
|
|
2b5643 |
- 168,
|
|
|
653b37 |
+ 112,
|
|
|
2b5643 |
168,
|
|
|
2b5643 |
},
|
|
|
2b5643 |
|