From: Dr. Stephen Henson <steve@openssl.org>
Date: Sun, 6 Feb 2011 00:51:05 +0000 (+0000)
Subject: Fix duplicate code and typo.
X-Git-Tag: OpenSSL-fips-2_0-rc1~790
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=61f477f4ab2ad9fcf072f37d9c5676a1ad03c037;p=oweals%2Fopenssl.git

Fix duplicate code and typo.
---

diff --git a/apps/s_server.c b/apps/s_server.c
index 6f77406ecb..f5d313ceb5 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -462,7 +462,7 @@ static void sv_usage(void)
 #endif
 	BIO_printf(bio_err," -ssl2         - Just talk SSLv2\n");
 	BIO_printf(bio_err," -ssl3         - Just talk SSLv3\n");
-	BIO_printf(bio_err," -tls1_1       - Just talk TLSv1_1\n");
+	BIO_printf(bio_err," -tls1_1       - Just talk TLSv1.1\n");
 	BIO_printf(bio_err," -tls1         - Just talk TLSv1\n");
 	BIO_printf(bio_err," -dtls1        - Just talk DTLSv1\n");
 	BIO_printf(bio_err," -timeout      - Enable timeouts\n");
@@ -1166,8 +1166,6 @@ int MAIN(int argc, char *argv[])
 			{ off|=SSL_OP_NO_TLSv1_1; }
 		else if	(strcmp(*argv,"-no_tls1") == 0)
 			{ off|=SSL_OP_NO_TLSv1; }
-		else if	(strcmp(*argv,"-no_tls1_1") == 0)
-			{ off|=SSL_OP_NO_TLSv1_1; }
 		else if	(strcmp(*argv,"-no_comp") == 0)
 			{ off|=SSL_OP_NO_COMPRESSION; }
 #ifndef OPENSSL_NO_TLSEXT