From: Dr. Stephen Henson <steve@openssl.org>
Date: Sat, 13 Nov 2010 12:44:17 +0000 (+0000)
Subject: add TLS v1.1 options to s_server
X-Git-Tag: OpenSSL_1_0_1-beta1~449
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=251431ff4fa606d0dd1bf29ac3cf15bb8646d1bf;p=oweals%2Fopenssl.git

add TLS v1.1 options to s_server
---

diff --git a/apps/s_server.c b/apps/s_server.c
index 49bfc816a1..9e2f4830b0 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -1124,6 +1124,8 @@ int MAIN(int argc, char *argv[])
 			{ off|=SSL_OP_NO_SSLv3; }
 		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
@@ -1141,6 +1143,8 @@ int MAIN(int argc, char *argv[])
 #ifndef OPENSSL_NO_TLS1
 		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)