diff options
author | Kurt Roeckx <kurt@roeckx.be> | 2016-03-08 20:26:38 +0100 |
---|---|---|
committer | Kurt Roeckx <kurt@roeckx.be> | 2016-03-09 19:10:28 +0100 |
commit | ca3895f0b52628df29bcf87e139971904f4b9b28 (patch) | |
tree | a8c7b5762dced9633219355017ae7d12ffb76c85 /ssl/s3_lib.c | |
parent | 82478521aace0ac91221ed451fceeadc007def9d (diff) | |
download | openssl-ca3895f0b52628df29bcf87e139971904f4b9b28.tar.gz |
Move disabling of RC4 for DTLS to the cipher list.
Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
MR: #1595
Diffstat (limited to 'ssl/s3_lib.c')
-rw-r--r-- | ssl/s3_lib.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c index c779ea76c3..973274bc8d 100644 --- a/ssl/s3_lib.c +++ b/ssl/s3_lib.c @@ -207,7 +207,7 @@ static const SSL_CIPHER ssl3_ciphers[] = { SSL_RC4, SSL_MD5, SSL3_VERSION, TLS1_2_VERSION, - DTLS1_VERSION, DTLS1_2_VERSION, + 0, 0, SSL_NOT_DEFAULT | SSL_MEDIUM, SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF, 128, @@ -224,7 +224,7 @@ static const SSL_CIPHER ssl3_ciphers[] = { SSL_RC4, SSL_SHA1, SSL3_VERSION, TLS1_2_VERSION, - DTLS1_VERSION, DTLS1_2_VERSION, + 0, 0, SSL_NOT_DEFAULT | SSL_MEDIUM, SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF, 128, @@ -313,7 +313,7 @@ static const SSL_CIPHER ssl3_ciphers[] = { SSL_RC4, SSL_MD5, SSL3_VERSION, TLS1_2_VERSION, - DTLS1_VERSION, DTLS1_2_VERSION, + 0, 0, SSL_NOT_DEFAULT | SSL_MEDIUM, SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF, 128, @@ -867,7 +867,7 @@ static const SSL_CIPHER ssl3_ciphers[] = { SSL_RC4, SSL_SHA1, SSL3_VERSION, TLS1_2_VERSION, - DTLS1_VERSION, DTLS1_2_VERSION, + 0, 0, SSL_NOT_DEFAULT | SSL_MEDIUM, SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF, 128, @@ -937,7 +937,7 @@ static const SSL_CIPHER ssl3_ciphers[] = { SSL_RC4, SSL_SHA1, SSL3_VERSION, TLS1_2_VERSION, - DTLS1_VERSION, DTLS1_2_VERSION, + 0, 0, SSL_NOT_DEFAULT | SSL_MEDIUM, SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF, 128, @@ -1007,7 +1007,7 @@ static const SSL_CIPHER ssl3_ciphers[] = { SSL_RC4, SSL_SHA1, SSL3_VERSION, TLS1_2_VERSION, - DTLS1_VERSION, DTLS1_2_VERSION, + 0, 0, SSL_NOT_DEFAULT | SSL_MEDIUM, SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF, 128, @@ -1757,7 +1757,7 @@ static const SSL_CIPHER ssl3_ciphers[] = { SSL_RC4, SSL_SHA1, SSL3_VERSION, TLS1_2_VERSION, - DTLS1_VERSION, DTLS1_2_VERSION, + 0, 0, SSL_NOT_DEFAULT | SSL_MEDIUM, SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF, 128, @@ -1844,7 +1844,7 @@ static const SSL_CIPHER ssl3_ciphers[] = { SSL_RC4, SSL_SHA1, SSL3_VERSION, TLS1_2_VERSION, - DTLS1_VERSION, DTLS1_2_VERSION, + 0, 0, SSL_NOT_DEFAULT | SSL_MEDIUM, SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF, 128, @@ -1931,7 +1931,7 @@ static const SSL_CIPHER ssl3_ciphers[] = { SSL_RC4, SSL_SHA1, SSL3_VERSION, TLS1_2_VERSION, - DTLS1_VERSION, DTLS1_2_VERSION, + 0, 0, SSL_NOT_DEFAULT | SSL_MEDIUM, SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF, 128, @@ -2300,7 +2300,7 @@ static const SSL_CIPHER ssl3_ciphers[] = { SSL_RC4, SSL_SHA1, SSL3_VERSION, TLS1_2_VERSION, - DTLS1_VERSION, DTLS1_2_VERSION, + 0, 0, SSL_NOT_DEFAULT | SSL_MEDIUM, SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF, 128, |