Don't disable TLS v1.2 by default now.

[openssl.git] / apps / s_server.c

diff --git a/apps/s_server.c b/apps/s_server.c
index 17ee441009f352dcc032dfcde49e392ca856acb9..35b24ee54a70d6bfbf561f5ab27db0b62374318c 100644 (file)
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -1526,9 +1526,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.