Commit 0fff5065 authored by Rich Salz's avatar Rich Salz
Browse files

SWEET32 (CVE-2016-2183): Move DES from HIGH to MEDIUM 



Reviewed-by: default avatarViktor Dukhovni <viktor@openssl.org>
Reviewed-by: default avatarEmilia Käsper <emilia@openssl.org>
parent 0ec01043

CHANGES

+4 −0
Original line number Diff line number Diff line
@@ -6,6 +6,10 @@ 


  *)



  *) In order to mitigate the SWEET32 attack (CVE-2016-2183),

     the DES ciphers were moved from HIGH to MEDIUM.

     [Rich Salz]



 Changes between 1.0.2g and 1.0.2h [3 May 2016]



  *) Prevent padding oracle in AES-NI CBC MAC check

ssl/s3_lib.c

+17 −17
Original line number Diff line number Diff line
@@ -329,7 +329,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[] = { 
     SSL_3DES,

     SSL_SHA1,

     SSL_SSLV3,

     SSL_NOT_EXP | SSL_HIGH | SSL_FIPS,

     SSL_NOT_EXP | SSL_MEDIUM | SSL_FIPS,

     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,

     112,

     168,
@@ -382,7 +382,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[] = { 
     SSL_3DES,

     SSL_SHA1,

     SSL_SSLV3,

     SSL_NOT_EXP | SSL_HIGH | SSL_FIPS,

     SSL_NOT_EXP | SSL_MEDIUM | SSL_FIPS,

     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,

     112,

     168,
@@ -434,7 +434,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[] = { 
     SSL_3DES,

     SSL_SHA1,

     SSL_SSLV3,

     SSL_NOT_EXP | SSL_HIGH | SSL_FIPS,

     SSL_NOT_EXP | SSL_MEDIUM | SSL_FIPS,

     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,

     112,

     168,
@@ -487,7 +487,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[] = { 
     SSL_3DES,

     SSL_SHA1,

     SSL_SSLV3,

     SSL_NOT_EXP | SSL_HIGH | SSL_FIPS,

     SSL_NOT_EXP | SSL_MEDIUM | SSL_FIPS,

     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,

     112,

     168,
@@ -539,7 +539,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[] = { 
     SSL_3DES,

     SSL_SHA1,

     SSL_SSLV3,

     SSL_NOT_EXP | SSL_HIGH | SSL_FIPS,

     SSL_NOT_EXP | SSL_MEDIUM | SSL_FIPS,

     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,

     112,

     168,
@@ -625,7 +625,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[] = { 
     SSL_3DES,

     SSL_SHA1,

     SSL_SSLV3,

     SSL_NOT_DEFAULT | SSL_NOT_EXP | SSL_HIGH | SSL_FIPS,

     SSL_NOT_DEFAULT | SSL_NOT_EXP | SSL_MEDIUM | SSL_FIPS,

     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,

     112,

     168,
@@ -712,7 +712,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[] = { 
     SSL_3DES,

     SSL_SHA1,

     SSL_SSLV3,

     SSL_NOT_EXP | SSL_HIGH | SSL_FIPS,

     SSL_NOT_EXP | SSL_MEDIUM | SSL_FIPS,

     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,

     112,

     168,
@@ -778,7 +778,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[] = { 
     SSL_3DES,

     SSL_MD5,

     SSL_SSLV3,

     SSL_NOT_EXP | SSL_HIGH,

     SSL_NOT_EXP | SSL_MEDIUM,

     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,

     112,

     168,
@@ -1728,7 +1728,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[] = { 
     SSL_3DES,

     SSL_SHA1,

     SSL_TLSV1,

     SSL_NOT_EXP | SSL_HIGH | SSL_FIPS,

     SSL_NOT_EXP | SSL_MEDIUM | SSL_FIPS,

     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,

     112,

     168,
@@ -2120,7 +2120,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[] = { 
     SSL_3DES,

     SSL_SHA1,

     SSL_TLSV1,

     SSL_NOT_EXP | SSL_HIGH | SSL_FIPS,

     SSL_NOT_EXP | SSL_MEDIUM | SSL_FIPS,

     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,

     112,

     168,
@@ -2200,7 +2200,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[] = { 
     SSL_3DES,

     SSL_SHA1,

     SSL_TLSV1,

     SSL_NOT_EXP | SSL_HIGH | SSL_FIPS,

     SSL_NOT_EXP | SSL_MEDIUM | SSL_FIPS,

     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,

     112,

     168,
@@ -2280,7 +2280,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[] = { 
     SSL_3DES,

     SSL_SHA1,

     SSL_TLSV1,

     SSL_NOT_EXP | SSL_HIGH | SSL_FIPS,

     SSL_NOT_EXP | SSL_MEDIUM | SSL_FIPS,

     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,

     112,

     168,
@@ -2360,7 +2360,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[] = { 
     SSL_3DES,

     SSL_SHA1,

     SSL_TLSV1,

     SSL_NOT_EXP | SSL_HIGH | SSL_FIPS,

     SSL_NOT_EXP | SSL_MEDIUM | SSL_FIPS,

     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,

     112,

     168,
@@ -2440,7 +2440,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[] = { 
     SSL_3DES,

     SSL_SHA1,

     SSL_TLSV1,

     SSL_NOT_DEFAULT | SSL_NOT_EXP | SSL_HIGH | SSL_FIPS,

     SSL_NOT_DEFAULT | SSL_NOT_EXP | SSL_MEDIUM | SSL_FIPS,

     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,

     112,

     168,
@@ -2490,7 +2490,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[] = { 
     SSL_3DES,

     SSL_SHA1,

     SSL_TLSV1,

     SSL_NOT_EXP | SSL_HIGH,

     SSL_NOT_EXP | SSL_MEDIUM,

     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,

     112,

     168,
@@ -2506,7 +2506,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[] = { 
     SSL_3DES,

     SSL_SHA1,

     SSL_TLSV1,

     SSL_NOT_EXP | SSL_HIGH,

     SSL_NOT_EXP | SSL_MEDIUM,

     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,

     112,

     168,
@@ -2522,7 +2522,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[] = { 
     SSL_3DES,

     SSL_SHA1,

     SSL_TLSV1,

     SSL_NOT_EXP | SSL_HIGH,

     SSL_NOT_EXP | SSL_MEDIUM,

     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,

     112,

     168,