diff options
author | jkim <jkim@FreeBSD.org> | 2014-08-07 21:04:42 +0000 |
---|---|---|
committer | jkim <jkim@FreeBSD.org> | 2014-08-07 21:04:42 +0000 |
commit | 2bfd7007417a2cd7c442bf1162e609303f217744 (patch) | |
tree | 2ead8295addf0f92cbe4bf28f39105c909a6702f /crypto/openssl/apps/ciphers.c | |
parent | 95576e5070819ac5bc80e16b237dc5a0061ed9a4 (diff) | |
download | FreeBSD-src-2bfd7007417a2cd7c442bf1162e609303f217744.zip FreeBSD-src-2bfd7007417a2cd7c442bf1162e609303f217744.tar.gz |
MFC: r269682
Merge OpenSSL 1.0.1i.
Diffstat (limited to 'crypto/openssl/apps/ciphers.c')
-rw-r--r-- | crypto/openssl/apps/ciphers.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/crypto/openssl/apps/ciphers.c b/crypto/openssl/apps/ciphers.c index 5f2b739..93dce1c 100644 --- a/crypto/openssl/apps/ciphers.c +++ b/crypto/openssl/apps/ciphers.c @@ -96,13 +96,7 @@ int MAIN(int argc, char **argv) char buf[512]; BIO *STDout=NULL; -#if !defined(OPENSSL_NO_SSL2) && !defined(OPENSSL_NO_SSL3) meth=SSLv23_server_method(); -#elif !defined(OPENSSL_NO_SSL3) - meth=SSLv3_server_method(); -#elif !defined(OPENSSL_NO_SSL2) - meth=SSLv2_server_method(); -#endif apps_startup(); |