Don't disable TLS v1.2 by default any more.

[openssl.git] / apps / s_client.c

diff --git a/apps/s_client.c b/apps/s_client.c
index daf22ba51cc532c311bce99f21c16ec4ddb63ac7..cde4828796f8c8a669c85da52b8ead76b99ce0a9 100644 (file)
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -1044,9 +1044,6 @@ bad:
                SSL_CTX_set_psk_client_callback(ctx, psk_client_cb);
                }
 #endif
                SSL_CTX_set_psk_client_callback(ctx, psk_client_cb);
                }
 #endif

-       /* 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);

        if (bugs)
                SSL_CTX_set_options(ctx,SSL_OP_ALL|off);
        else
        if (bugs)
                SSL_CTX_set_options(ctx,SSL_OP_ALL|off);
        else