0376d8368c
- do not include ECC ciphersuites in SSLv2 client hello (#1090952) - fail on hmac integrity check if the .hmac file is empty
169 lines
3.4 KiB
Diff
169 lines
3.4 KiB
Diff
diff -up openssl-1.0.1g/ssl/s2_lib.c.3des-strength openssl-1.0.1g/ssl/s2_lib.c
|
|
--- openssl-1.0.1g/ssl/s2_lib.c.3des-strength 2014-03-17 17:14:20.000000000 +0100
|
|
+++ openssl-1.0.1g/ssl/s2_lib.c 2014-05-06 16:33:45.646358418 +0200
|
|
@@ -250,7 +250,7 @@ OPENSSL_GLOBAL const SSL_CIPHER ssl2_cip
|
|
SSL_SSLV2,
|
|
SSL_NOT_EXP|SSL_HIGH,
|
|
0,
|
|
- 168,
|
|
+ 128,
|
|
168,
|
|
},
|
|
|
|
diff -up openssl-1.0.1g/ssl/s3_lib.c.3des-strength openssl-1.0.1g/ssl/s3_lib.c
|
|
--- openssl-1.0.1g/ssl/s3_lib.c.3des-strength 2014-03-17 17:14:20.000000000 +0100
|
|
+++ openssl-1.0.1g/ssl/s3_lib.c 2014-05-06 16:38:05.887374872 +0200
|
|
@@ -328,7 +328,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]
|
|
SSL_SSLV3,
|
|
SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
|
|
SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
|
|
- 168,
|
|
+ 128,
|
|
168,
|
|
},
|
|
|
|
@@ -377,7 +377,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]
|
|
SSL_SSLV3,
|
|
SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
|
|
SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
|
|
- 168,
|
|
+ 128,
|
|
168,
|
|
},
|
|
|
|
@@ -425,7 +425,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]
|
|
SSL_SSLV3,
|
|
SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
|
|
SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
|
|
- 168,
|
|
+ 128,
|
|
168,
|
|
},
|
|
|
|
@@ -474,7 +474,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]
|
|
SSL_SSLV3,
|
|
SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
|
|
SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
|
|
- 168,
|
|
+ 128,
|
|
168,
|
|
},
|
|
|
|
@@ -522,7 +522,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]
|
|
SSL_SSLV3,
|
|
SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
|
|
SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
|
|
- 168,
|
|
+ 128,
|
|
168,
|
|
},
|
|
|
|
@@ -602,7 +602,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]
|
|
SSL_SSLV3,
|
|
SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
|
|
SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
|
|
- 168,
|
|
+ 128,
|
|
168,
|
|
},
|
|
|
|
@@ -687,7 +687,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]
|
|
SSL_SSLV3,
|
|
SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
|
|
SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
|
|
- 168,
|
|
+ 128,
|
|
168,
|
|
},
|
|
|
|
@@ -751,7 +751,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]
|
|
SSL_SSLV3,
|
|
SSL_NOT_EXP|SSL_HIGH,
|
|
SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
|
|
- 168,
|
|
+ 128,
|
|
168,
|
|
},
|
|
|
|
@@ -1685,7 +1685,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]
|
|
SSL_TLSV1,
|
|
SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
|
|
SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
|
|
- 168,
|
|
+ 128,
|
|
168,
|
|
},
|
|
|
|
@@ -2062,7 +2062,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]
|
|
SSL_TLSV1,
|
|
SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
|
|
SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
|
|
- 168,
|
|
+ 128,
|
|
168,
|
|
},
|
|
|
|
@@ -2142,7 +2142,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]
|
|
SSL_TLSV1,
|
|
SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
|
|
SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
|
|
- 168,
|
|
+ 128,
|
|
168,
|
|
},
|
|
|
|
@@ -2222,7 +2222,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]
|
|
SSL_TLSV1,
|
|
SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
|
|
SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
|
|
- 168,
|
|
+ 128,
|
|
168,
|
|
},
|
|
|
|
@@ -2302,7 +2302,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]
|
|
SSL_TLSV1,
|
|
SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
|
|
SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
|
|
- 168,
|
|
+ 128,
|
|
168,
|
|
},
|
|
|
|
@@ -2382,7 +2382,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]
|
|
SSL_TLSV1,
|
|
SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
|
|
SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
|
|
- 168,
|
|
+ 128,
|
|
168,
|
|
},
|
|
|
|
@@ -2432,7 +2432,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]
|
|
SSL_TLSV1,
|
|
SSL_NOT_EXP|SSL_HIGH,
|
|
SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
|
|
- 168,
|
|
+ 128,
|
|
168,
|
|
},
|
|
|
|
@@ -2448,7 +2448,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]
|
|
SSL_TLSV1,
|
|
SSL_NOT_EXP|SSL_HIGH,
|
|
SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
|
|
- 168,
|
|
+ 128,
|
|
168,
|
|
},
|
|
|
|
@@ -2464,7 +2464,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]
|
|
SSL_TLSV1,
|
|
SSL_NOT_EXP|SSL_HIGH,
|
|
SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
|
|
- 168,
|
|
+ 128,
|
|
168,
|
|
},
|
|
|