diff options
author | Dr. Stephen Henson <steve@openssl.org> | 2010-06-27 14:15:02 +0000 |
---|---|---|
committer | Dr. Stephen Henson <steve@openssl.org> | 2010-06-27 14:15:02 +0000 |
commit | 1eb1cf452b1263373ff3f7c91b9419adca8c3ba8 (patch) | |
tree | ca6879dd674835277eac140dfb56d57a0d2bd493 /apps/s_server.c | |
parent | c549810defcc9b2f30f0f0da88c505b8088a7106 (diff) |
Backport TLS v1.1 support from HEAD
Diffstat (limited to 'apps/s_server.c')
-rw-r--r-- | apps/s_server.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/apps/s_server.c b/apps/s_server.c index 8a0c34cf0f..49bfc816a1 100644 --- a/apps/s_server.c +++ b/apps/s_server.c @@ -458,6 +458,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 - Just talk TLSv1\n"); BIO_printf(bio_err," -dtls1 - Just talk DTLSv1\n"); BIO_printf(bio_err," -timeout - Enable timeouts\n"); @@ -466,6 +467,7 @@ static void sv_usage(void) BIO_printf(bio_err," -no_ssl2 - Just disable SSLv2\n"); BIO_printf(bio_err," -no_ssl3 - Just disable SSLv3\n"); BIO_printf(bio_err," -no_tls1 - Just disable TLSv1\n"); + BIO_printf(bio_err," -no_tls1_1 - Just disable TLSv1.1\n"); #ifndef OPENSSL_NO_DH BIO_printf(bio_err," -no_dhe - Disable ephemeral DH\n"); #endif |