add TLS v1.1 options to s_server
authorDr. Stephen Henson <steve@openssl.org>
Sat, 13 Nov 2010 12:44:17 +0000 (12:44 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Sat, 13 Nov 2010 12:44:17 +0000 (12:44 +0000)
apps/s_server.c

index 49bfc816a110b12c22d1693591e41e77df9642cc..9e2f4830b07a6568db5c32b458d8f8645b8a91d2 100644 (file)
@@ -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)