From 380ea99a8c0670ce466a92e71fc806a3f7aab7c2 Mon Sep 17 00:00:00 2001
From: doug <>
Date: Fri, 17 Jul 2015 16:09:46 +0000
Subject: Remove SSLv3 support from openssl(1) s_server.

ok miod@ bcook@ beck@
---
 src/usr.bin/openssl/s_server.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/usr.bin/openssl/s_server.c b/src/usr.bin/openssl/s_server.c
index 066588f01b..2422642989 100644
--- a/src/usr.bin/openssl/s_server.c
+++ b/src/usr.bin/openssl/s_server.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s_server.c,v 1.12 2015/07/17 07:04:41 doug Exp $ */
+/* $OpenBSD: s_server.c,v 1.13 2015/07/17 16:09:46 doug Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -310,7 +310,6 @@ sv_usage(void)
 	BIO_printf(bio_err, " -cipher arg   - play with 'openssl ciphers' to see what goes here\n");
 	BIO_printf(bio_err, " -serverpref   - Use server's cipher preferences\n");
 	BIO_printf(bio_err, " -quiet        - Inhibit printing of session and certificate information\n");
-	BIO_printf(bio_err, " -ssl3         - Just talk SSLv3\n");
 	BIO_printf(bio_err, " -tls1_2       - Just talk TLSv1.2\n");
 	BIO_printf(bio_err, " -tls1_1       - Just talk TLSv1.1\n");
 	BIO_printf(bio_err, " -tls1         - Just talk TLSv1\n");
@@ -806,12 +805,8 @@ s_server_main(int argc, char *argv[])
 			off |= SSL_OP_NO_TLSv1_2;
 		} else if (strcmp(*argv, "-no_comp") == 0) {
 			off |= SSL_OP_NO_COMPRESSION;
-		}
-		else if (strcmp(*argv, "-no_ticket") == 0) {
+		} else if (strcmp(*argv, "-no_ticket") == 0) {
 			off |= SSL_OP_NO_TICKET;
-		}
-		else if (strcmp(*argv, "-ssl3") == 0) {
-			meth = SSLv3_server_method();
 		} else if (strcmp(*argv, "-tls1") == 0) {
 			meth = TLSv1_server_method();
 		} else if (strcmp(*argv, "-tls1_1") == 0) {
-- 
cgit v1.2.3-55-g6feb