summaryrefslogtreecommitdiffstats
path: root/apps/s_server.c
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2010-11-13 12:44:17 +0000
committerDr. Stephen Henson <steve@openssl.org>2010-11-13 12:44:17 +0000
commit251431ff4fa606d0dd1bf29ac3cf15bb8646d1bf (patch)
tree6451a0b7a5e413fcfd4f47d760b731373da59f54 /apps/s_server.c
parent1a3052793e341a71cd7476c58eee8e040ed966e0 (diff)
add TLS v1.1 options to s_server
Diffstat (limited to 'apps/s_server.c')
-rw-r--r--apps/s_server.c4
1 files changed, 4 insertions, 0 deletions
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)