Don't disable TLS v1.2 by default now.
authorDr. Stephen Henson <steve@openssl.org>
Sun, 9 Oct 2011 23:26:39 +0000 (23:26 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Sun, 9 Oct 2011 23:26:39 +0000 (23:26 +0000)
apps/s_client.c
apps/s_server.c
ssl/ssl_lib.c

index 683169a..ef45e43 100644 (file)
@@ -1106,9 +1106,6 @@ bad:
                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
index 17ee441..35b24ee 100644 (file)
@@ -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.
index c983474..3a87572 100644 (file)
@@ -1849,8 +1849,6 @@ SSL_CTX *SSL_CTX_new(const SSL_METHOD *meth)
         * deployed might change this.
         */
        ret->options |= SSL_OP_LEGACY_SERVER_CONNECT;
-       /* Disable TLS v1.2 by default for now */
-       ret->options |= SSL_OP_NO_TLSv1_2;
 
        return(ret);
 err: