Commit ec783dc1 authored by Jay Satiro's avatar Jay Satiro Committed by Daniel Stenberg
Browse files

SSL: Remove SSLv3 from SSL default due to POODLE attack 

- Remove SSLv3 from SSL default in darwinssl, schannel, cyassl, nss,
openssl effectively making the default TLS 1.x. axTLS is not affected
since it supports only TLS, and gnutls is not affected since it already
defaults to TLS 1.x.

- Update CURLOPT_SSLVERSION doc
parent 2b042574

docs/libcurl/opts/CURLOPT_SSLVERSION.3

+3 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ Use one of the available defines for this purpose. The available options are: 
.RS

.IP CURL_SSLVERSION_DEFAULT

The default action. This will attempt to figure out the remote SSL protocol

version, i.e. either SSLv3 or TLSv1

version.

.IP CURL_SSLVERSION_TLSv1

TLSv1.x

.IP CURL_SSLVERSION_SSLv2
@@ -69,6 +69,8 @@ if(curl) { 
.SH AVAILABILITY

SSLv2 is disabled by default since 7.18.1. Other SSL versions availability may

vary depending on which backend libcurl has been built to use.



SSLv3 is disabled by default since 7.39.0.

.SH RETURN VALUE

Returns CURLE_OK if the option is supported, and CURLE_UNKNOWN_OPTION if not.

.SH "SEE ALSO"

lib/vtls/curl_darwinssl.c

+4 −25
Original line number Diff line number Diff line
@@ -1057,10 +1057,8 @@ static CURLcode darwinssl_connect_step1(struct connectdata *conn, 
#if CURL_BUILD_MAC_10_8 || CURL_BUILD_IOS

  if(SSLSetProtocolVersionMax != NULL) {

    switch(data->set.ssl.version) {

      case CURL_SSLVERSION_DEFAULT: default:

        (void)SSLSetProtocolVersionMin(connssl->ssl_ctx, kSSLProtocol3);

        (void)SSLSetProtocolVersionMax(connssl->ssl_ctx, kTLSProtocol12);

        break;

      default:

      case CURL_SSLVERSION_DEFAULT:

      case CURL_SSLVERSION_TLSv1:

        (void)SSLSetProtocolVersionMin(connssl->ssl_ctx, kTLSProtocol1);

        (void)SSLSetProtocolVersionMax(connssl->ssl_ctx, kTLSProtocol12);
@@ -1096,20 +1094,8 @@ static CURLcode darwinssl_connect_step1(struct connectdata *conn, 
                                       kSSLProtocolAll,

                                       false);

    switch (data->set.ssl.version) {

      case CURL_SSLVERSION_DEFAULT: default:

        (void)SSLSetProtocolVersionEnabled(connssl->ssl_ctx,

                                           kSSLProtocol3,

                                           true);

        (void)SSLSetProtocolVersionEnabled(connssl->ssl_ctx,

                                           kTLSProtocol1,

                                           true);

        (void)SSLSetProtocolVersionEnabled(connssl->ssl_ctx,

                                           kTLSProtocol11,

                                           true);

        (void)SSLSetProtocolVersionEnabled(connssl->ssl_ctx,

                                           kTLSProtocol12,

                                           true);

        break;

      default:

      case CURL_SSLVERSION_DEFAULT:

      case CURL_SSLVERSION_TLSv1:

        (void)SSLSetProtocolVersionEnabled(connssl->ssl_ctx,

                                           kTLSProtocol1,
@@ -1158,13 +1144,6 @@ static CURLcode darwinssl_connect_step1(struct connectdata *conn, 
  switch(data->set.ssl.version) {

    default:

    case CURL_SSLVERSION_DEFAULT:

      (void)SSLSetProtocolVersionEnabled(connssl->ssl_ctx,

                                         kSSLProtocol3,

                                         true);

      (void)SSLSetProtocolVersionEnabled(connssl->ssl_ctx,

                                         kTLSProtocol1,

                                         true);

      break;

    case CURL_SSLVERSION_TLSv1:

    case CURL_SSLVERSION_TLSv1_0:

      (void)SSLSetProtocolVersionEnabled(connssl->ssl_ctx,

lib/vtls/curl_schannel.c

+2 −6
Original line number Diff line number Diff line
@@ -164,6 +164,8 @@ schannel_connect_step1(struct connectdata *conn, int sockindex) 
    }



    switch(data->set.ssl.version) {

      default:

      case CURL_SSLVERSION_DEFAULT:

      case CURL_SSLVERSION_TLSv1:

        schannel_cred.grbitEnabledProtocols = SP_PROT_TLS1_0_CLIENT |

                                              SP_PROT_TLS1_1_CLIENT |
@@ -184,12 +186,6 @@ schannel_connect_step1(struct connectdata *conn, int sockindex) 
      case CURL_SSLVERSION_SSLv2:

        schannel_cred.grbitEnabledProtocols = SP_PROT_SSL2_CLIENT;

        break;

      default:

        schannel_cred.grbitEnabledProtocols = SP_PROT_TLS1_0_CLIENT |

                                              SP_PROT_TLS1_1_CLIENT |

                                              SP_PROT_TLS1_2_CLIENT |

                                              SP_PROT_SSL3_CLIENT;

        break;

    }



    /* allocate memory for the re-usable credential handle */

lib/vtls/cyassl.c

+1 −5
Original line number Diff line number Diff line
@@ -99,10 +99,8 @@ cyassl_connect_step1(struct connectdata *conn, 


  /* check to see if we've been told to use an explicit SSL/TLS version */

  switch(data->set.ssl.version) {

  default:

  case CURL_SSLVERSION_DEFAULT:

    /* we try to figure out version */

    req_method = SSLv23_client_method();

    break;

  case CURL_SSLVERSION_TLSv1:

    infof(data, "CyaSSL cannot be configured to use TLS 1.0-1.2, "

          "TLS 1.0 is used exclusively\n");
@@ -120,8 +118,6 @@ cyassl_connect_step1(struct connectdata *conn, 
  case CURL_SSLVERSION_SSLv3:

    req_method = SSLv3_client_method();

    break;

  default:

    req_method = TLSv1_client_method();

  }



  if(!req_method) {

lib/vtls/nss.c

+1 −8
Original line number Diff line number Diff line
@@ -1345,15 +1345,8 @@ static CURLcode nss_init_sslver(SSLVersionRange *sslver, 
  switch (data->set.ssl.version) {

  default:

  case CURL_SSLVERSION_DEFAULT:

    sslver->min = SSL_LIBRARY_VERSION_3_0;

    if(data->state.ssl_connect_retry) {

      infof(data, "TLS disabled due to previous handshake failure\n");

      sslver->max = SSL_LIBRARY_VERSION_3_0;

      return CURLE_OK;

    }

  /* intentional fall-through to default to highest TLS version if possible */



  case CURL_SSLVERSION_TLSv1:

    sslver->min = SSL_LIBRARY_VERSION_TLS_1_0;

#ifdef SSL_LIBRARY_VERSION_TLS_1_2

    sslver->max = SSL_LIBRARY_VERSION_TLS_1_2;

#elif defined SSL_LIBRARY_VERSION_TLS_1_1