From: Dr. Stephen Henson <steve@openssl.org>
Date: Tue, 16 Nov 2010 14:16:00 +0000 (+0000)
Subject: add TLS v1.1 options to s_server
X-Git-Tag: OpenSSL-fips-2_0-rc1~947
X-Git-Url: https://git.openssl.org/?p=openssl.git;a=commitdiff_plain;h=f7d2f17a0709abb641799e32a11a2408d733d8ed

add TLS v1.1 options to s_server
---

diff --git a/apps/s_server.c b/apps/s_server.c
index f1fbbcaf1f..6f77406ecb 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -1166,6 +1166,8 @@ 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
@@ -1185,6 +1187,8 @@ int MAIN(int argc, char *argv[])
 			{ meth=TLSv1_1_server_method(); }
 		else if	(strcmp(*argv,"-tls1") == 0)
 			{ meth=TLSv1_server_method(); }
+		else if	(strcmp(*argv,"-tls1_1") == 0)
+			{ meth=TLSv1_1_server_method(); }
 #endif
 #ifndef OPENSSL_NO_DTLS1
 		else if	(strcmp(*argv,"-dtls1") == 0)