diff options
author | delphij <delphij@FreeBSD.org> | 2016-03-02 15:43:01 +0000 |
---|---|---|
committer | delphij <delphij@FreeBSD.org> | 2016-03-02 15:43:01 +0000 |
commit | 73af9669cdc04af0c06344ce6f0d85808187eab3 (patch) | |
tree | f76285aeef43941ffcb77e3220027526a2c2c421 /crypto/openssl/ssl/s2_lib.c | |
parent | 3b4b162df0228ed74a1e63eccc7315071254344f (diff) | |
download | FreeBSD-src-73af9669cdc04af0c06344ce6f0d85808187eab3.zip FreeBSD-src-73af9669cdc04af0c06344ce6f0d85808187eab3.tar.gz |
Merge OpenSSL 1.0.1s. This is a security update.
Relnotes: yes
Approved by: re (so@ implicit)
Diffstat (limited to 'crypto/openssl/ssl/s2_lib.c')
-rw-r--r-- | crypto/openssl/ssl/s2_lib.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/crypto/openssl/ssl/s2_lib.c b/crypto/openssl/ssl/s2_lib.c index 7e3674a..82c1731 100644 --- a/crypto/openssl/ssl/s2_lib.c +++ b/crypto/openssl/ssl/s2_lib.c @@ -156,6 +156,7 @@ OPENSSL_GLOBAL const SSL_CIPHER ssl2_ciphers[] = { 128, }, +# if 0 /* RC4_128_EXPORT40_WITH_MD5 */ { 1, @@ -171,6 +172,7 @@ OPENSSL_GLOBAL const SSL_CIPHER ssl2_ciphers[] = { 40, 128, }, +# endif /* RC2_128_CBC_WITH_MD5 */ { @@ -188,6 +190,7 @@ OPENSSL_GLOBAL const SSL_CIPHER ssl2_ciphers[] = { 128, }, +# if 0 /* RC2_128_CBC_EXPORT40_WITH_MD5 */ { 1, @@ -203,6 +206,7 @@ OPENSSL_GLOBAL const SSL_CIPHER ssl2_ciphers[] = { 40, 128, }, +# endif # ifndef OPENSSL_NO_IDEA /* IDEA_128_CBC_WITH_MD5 */ @@ -222,6 +226,7 @@ OPENSSL_GLOBAL const SSL_CIPHER ssl2_ciphers[] = { }, # endif +# if 0 /* DES_64_CBC_WITH_MD5 */ { 1, @@ -237,6 +242,7 @@ OPENSSL_GLOBAL const SSL_CIPHER ssl2_ciphers[] = { 56, 56, }, +# endif /* DES_192_EDE3_CBC_WITH_MD5 */ { |