summaryrefslogtreecommitdiffstats
path: root/apps/s_server.c
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2011-10-09 23:28:25 +0000
committerDr. Stephen Henson <steve@openssl.org>2011-10-09 23:28:25 +0000
commit6bd173fced6935db65756ecd0678e8666c53284e (patch)
tree1192e85de74ab1ea4314b41f49f9dbdea901335d /apps/s_server.c
parent6b00cd746afd7758ec1873a8be6a3a9f12c5b482 (diff)
Don't disable TLS v1.2 by default any more.
Diffstat (limited to 'apps/s_server.c')
-rw-r--r--apps/s_server.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/apps/s_server.c b/apps/s_server.c
index 71c92e6ca4..0137b31cd1 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -1463,9 +1463,6 @@ bad:
SSL_CTX_set_quiet_shutdown(ctx,1);
if (bugs) SSL_CTX_set_options(ctx,SSL_OP_ALL);
if (hack) SSL_CTX_set_options(ctx,SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG);
- /* HACK while TLS v1.2 is disabled by default */
- if (!(off & SSL_OP_NO_TLSv1_2))
- SSL_CTX_clear_options(ctx, SSL_OP_NO_TLSv1_2);
SSL_CTX_set_options(ctx,off);
/* DTLS: partial reads end up discarding unread UDP bytes :-(
* Setting read ahead solves this problem.