diff options
| author | Renato Botelho <renato@netgate.com> | 2016-03-02 14:39:21 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-03-02 14:39:21 -0300 |
| commit | 065e672a01ab2d9ebfed1dccb588be99bd5bc73a (patch) | |
| tree | d9dac06d252aac65ba30921226a2f5f5d63c1bb1 /crypto/openssl/ssl/s2_lib.c | |
| parent | b4655eb4fab0c00a03febe9ef8caad97c0026fe5 (diff) | |
| parent | 73af9669cdc04af0c06344ce6f0d85808187eab3 (diff) | |
| download | FreeBSD-src-065e672a01ab2d9ebfed1dccb588be99bd5bc73a.zip FreeBSD-src-065e672a01ab2d9ebfed1dccb588be99bd5bc73a.tar.gz | |
Merge remote-tracking branch 'origin/stable/10' into devel
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 */ { |
