Commit d4f62f6c authored by Paul Howarth's avatar Paul Howarth Committed by Kamil Dudka
Browse files

nss: fix compilation failure with old versions of NSS 

Bug: http://curl.haxx.se/mail/lib-2015-04/0095.html
parent 1945f99d

lib/vtls/nss.c

+4 −2
Original line number Original line Diff line number Diff line
@@ -725,6 +725,7 @@ static void HandshakeCallback(PRFileDesc *sock, void *arg) 
  }

  }

}

}





#if NSSVERNUM >= 0x030f04 /* 3.15.4 */

static SECStatus CanFalseStartCallback(PRFileDesc *sock, void *client_data,

static SECStatus CanFalseStartCallback(PRFileDesc *sock, void *client_data,

                                       PRBool *canFalseStart)

                                       PRBool *canFalseStart)

{

{
@@ -782,6 +783,7 @@ static SECStatus CanFalseStartCallback(PRFileDesc *sock, void *client_data, 
end:

end:

  return SECSuccess;

  return SECSuccess;

}

}

#endif





static void display_cert_info(struct SessionHandle *data,

static void display_cert_info(struct SessionHandle *data,

                              CERTCertificate *cert)

                              CERTCertificate *cert)
@@ -1754,7 +1756,7 @@ static CURLcode nss_setup_connect(struct connectdata *conn, int sockindex) 
    goto error;

    goto error;

#endif

#endif





#ifdef SSL_ENABLE_FALSE_START

#if NSSVERNUM >= 0x030f04 /* 3.15.4 */

  if(data->set.ssl.falsestart) {

  if(data->set.ssl.falsestart) {

    if(SSL_OptionSet(connssl->handle, SSL_ENABLE_FALSE_START, PR_TRUE)

    if(SSL_OptionSet(connssl->handle, SSL_ENABLE_FALSE_START, PR_TRUE)

        != SECSuccess)

        != SECSuccess)
@@ -2049,7 +2051,7 @@ bool Curl_nss_cert_status_request(void) 
}

}





bool Curl_nss_false_start(void) {

bool Curl_nss_false_start(void) {

#ifdef SSL_ENABLE_FALSE_START

#if NSSVERNUM >= 0x030f04 /* 3.15.4 */

  return TRUE;

  return TRUE;

#else

#else

  return FALSE;

  return FALSE;