summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordoug <>2015-07-17 16:07:44 +0000
committerdoug <>2015-07-17 16:07:44 +0000
commit9e7830547c8468e6c12aab59baba93313d509cb9 (patch)
treeeb3b89a4f612b7f9a3b2ed656e51f5da9b7567af
parent4cae62a20c61d269f5c320f29efdc944667583f2 (diff)
downloadopenbsd-9e7830547c8468e6c12aab59baba93313d509cb9.tar.gz
openbsd-9e7830547c8468e6c12aab59baba93313d509cb9.tar.bz2
openbsd-9e7830547c8468e6c12aab59baba93313d509cb9.zip
Remove SSLv3 support from openssl(1) s_client.
ok miod@ bcook@ beck@
-rw-r--r--src/usr.bin/openssl/s_client.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/usr.bin/openssl/s_client.c b/src/usr.bin/openssl/s_client.c
index 83a515c824..14e1a4bab9 100644
--- a/src/usr.bin/openssl/s_client.c
+++ b/src/usr.bin/openssl/s_client.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: s_client.c,v 1.13 2015/04/14 12:56:36 jsing Exp $ */ 1/* $OpenBSD: s_client.c,v 1.14 2015/07/17 16:07:44 doug Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -223,7 +223,6 @@ sc_usage(void)
223 BIO_printf(bio_err, " -quiet - no s_client output\n"); 223 BIO_printf(bio_err, " -quiet - no s_client output\n");
224 BIO_printf(bio_err, " -ign_eof - ignore input eof (default when -quiet)\n"); 224 BIO_printf(bio_err, " -ign_eof - ignore input eof (default when -quiet)\n");
225 BIO_printf(bio_err, " -no_ign_eof - don't ignore input eof\n"); 225 BIO_printf(bio_err, " -no_ign_eof - don't ignore input eof\n");
226 BIO_printf(bio_err, " -ssl3 - just use SSLv3\n");
227 BIO_printf(bio_err, " -tls1_2 - just use TLSv1.2\n"); 226 BIO_printf(bio_err, " -tls1_2 - just use TLSv1.2\n");
228 BIO_printf(bio_err, " -tls1_1 - just use TLSv1.1\n"); 227 BIO_printf(bio_err, " -tls1_1 - just use TLSv1.1\n");
229 BIO_printf(bio_err, " -tls1 - just use TLSv1\n"); 228 BIO_printf(bio_err, " -tls1 - just use TLSv1\n");
@@ -472,8 +471,6 @@ s_client_main(int argc, char **argv)
472 nbio_test = 1; 471 nbio_test = 1;
473 else if (strcmp(*argv, "-state") == 0) 472 else if (strcmp(*argv, "-state") == 0)
474 state = 1; 473 state = 1;
475 else if (strcmp(*argv, "-ssl3") == 0)
476 meth = SSLv3_client_method();
477 else if (strcmp(*argv, "-tls1_2") == 0) 474 else if (strcmp(*argv, "-tls1_2") == 0)
478 meth = TLSv1_2_client_method(); 475 meth = TLSv1_2_client_method();
479 else if (strcmp(*argv, "-tls1_1") == 0) 476 else if (strcmp(*argv, "-tls1_1") == 0)