|
 |
2b5643 |
Although the real strength is rather 112 bits we use 128 here as
|
|
|
2b5643 |
we do not want to sort it behind more obscure ciphers.
|
|
|
2b5643 |
AES-128 is preferred anyway.
|
|
|
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
|
|
|
2b5643 |
+++ openssl-1.0.1e/ssl/s2_lib.c 2014-01-22 16:32:45.791700322 +0100
|
|
|
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,
|
|
|
2b5643 |
+ 128,
|
|
|
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
|
|
|
2b5643 |
--- openssl-1.0.1e/ssl/s3_lib.c.3des-strength 2014-01-17 11:41:11.000000000 +0100
|
|
|
2b5643 |
+++ openssl-1.0.1e/ssl/s3_lib.c 2014-01-22 16:31:14.713666777 +0100
|
|
|
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,
|
|
|
2b5643 |
+ 128,
|
|
|
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,
|
|
|
2b5643 |
+ 128,
|
|
|
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,
|
|
|
2b5643 |
+ 128,
|
|
|
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,
|
|
|
2b5643 |
+ 128,
|
|
|
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,
|
|
|
2b5643 |
+ 128,
|
|
|
2b5643 |
168,
|
|
|
2b5643 |
},
|
|
|
2b5643 |
|
|
|
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,
|
|
|
2b5643 |
+ 128,
|
|
|
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,
|
|
|
2b5643 |
+ 128,
|
|
|
2b5643 |
168,
|
|
|
2b5643 |
},
|
|
|
2b5643 |
|
|
|
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,
|
|
|
2b5643 |
+ 128,
|
|
|
2b5643 |
168,
|
|
|
2b5643 |
},
|
|
|
2b5643 |
|
|
|
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,
|
|
|
2b5643 |
+ 128,
|
|
|
2b5643 |
168,
|
|
|
2b5643 |
},
|
|
|
2b5643 |
|
|
|
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,
|
|
|
2b5643 |
+ 128,
|
|
|
2b5643 |
168,
|
|
|
2b5643 |
},
|
|
|
2b5643 |
|
|
|
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,
|
|
|
2b5643 |
+ 128,
|
|
|
2b5643 |
168,
|
|
|
2b5643 |
},
|
|
|
2b5643 |
|
|
|
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,
|
|
|
2b5643 |
+ 128,
|
|
|
2b5643 |
168,
|
|
|
2b5643 |
},
|
|
|
2b5643 |
|
|
|
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,
|
|
|
2b5643 |
+ 128,
|
|
|
2b5643 |
168,
|
|
|
2b5643 |
},
|
|
|
2b5643 |
|
|
|
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,
|
|
|
2b5643 |
+ 128,
|
|
|
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,
|
|
|
2b5643 |
+ 128,
|
|
|
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,
|
|
|
2b5643 |
+ 128,
|
|
|
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,
|
|
|
2b5643 |
+ 128,
|
|
|
2b5643 |
168,
|
|
|
2b5643 |
},
|
|
|
2b5643 |
|