summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordoug <doug@openbsd.org>2015-07-17 16:07:44 +0000
committerdoug <doug@openbsd.org>2015-07-17 16:07:44 +0000
commitbfd4ec74411e0c09e53035fcac6b34a676e1c8d0 (patch)
treeb47370f14e6fe2f64613c89955ffcee0ad8eb935
parentRemove support for SSLv3 from openssl(1) ciphers. (diff)
downloadwireguard-openbsd-bfd4ec74411e0c09e53035fcac6b34a676e1c8d0.tar.xz
wireguard-openbsd-bfd4ec74411e0c09e53035fcac6b34a676e1c8d0.zip
Remove SSLv3 support from openssl(1) s_client.
ok miod@ bcook@ beck@
-rw-r--r--usr.bin/openssl/s_client.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/usr.bin/openssl/s_client.c b/usr.bin/openssl/s_client.c
index 83a515c8242..14e1a4bab9c 100644
--- a/usr.bin/openssl/s_client.c
+++ b/usr.bin/openssl/s_client.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s_client.c,v 1.13 2015/04/14 12:56:36 jsing Exp $ */
+/* $OpenBSD: s_client.c,v 1.14 2015/07/17 16:07:44 doug Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@ -223,7 +223,6 @@ sc_usage(void)
BIO_printf(bio_err, " -quiet - no s_client output\n");
BIO_printf(bio_err, " -ign_eof - ignore input eof (default when -quiet)\n");
BIO_printf(bio_err, " -no_ign_eof - don't ignore input eof\n");
- BIO_printf(bio_err, " -ssl3 - just use SSLv3\n");
BIO_printf(bio_err, " -tls1_2 - just use TLSv1.2\n");
BIO_printf(bio_err, " -tls1_1 - just use TLSv1.1\n");
BIO_printf(bio_err, " -tls1 - just use TLSv1\n");
@@ -472,8 +471,6 @@ s_client_main(int argc, char **argv)
nbio_test = 1;
else if (strcmp(*argv, "-state") == 0)
state = 1;
- else if (strcmp(*argv, "-ssl3") == 0)
- meth = SSLv3_client_method();
else if (strcmp(*argv, "-tls1_2") == 0)
meth = TLSv1_2_client_method();
else if (strcmp(*argv, "-tls1_1") == 0)