Skip to content

Commit

Permalink
nss: fix compilation failure with old versions of NSS
Browse files Browse the repository at this point in the history
  • Loading branch information
pghmcfc authored and kdudka committed Apr 27, 2015
1 parent 1945f99 commit d4f62f6
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions lib/vtls/nss.c
Expand Up @@ -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,
PRBool *canFalseStart)
{
Expand Down Expand Up @@ -782,6 +783,7 @@ static SECStatus CanFalseStartCallback(PRFileDesc *sock, void *client_data,
end:
return SECSuccess;
}
#endif

static void display_cert_info(struct SessionHandle *data,
CERTCertificate *cert)
Expand Down Expand Up @@ -1754,7 +1756,7 @@ static CURLcode nss_setup_connect(struct connectdata *conn, int sockindex)
goto error;
#endif

#ifdef SSL_ENABLE_FALSE_START
#if NSSVERNUM >= 0x030f04 /* 3.15.4 */
if(data->set.ssl.falsestart) {
if(SSL_OptionSet(connssl->handle, SSL_ENABLE_FALSE_START, PR_TRUE)
!= SECSuccess)
Expand Down Expand Up @@ -2049,7 +2051,7 @@ bool Curl_nss_cert_status_request(void)
}

bool Curl_nss_false_start(void) {
#ifdef SSL_ENABLE_FALSE_START
#if NSSVERNUM >= 0x030f04 /* 3.15.4 */
return TRUE;
#else
return FALSE;
Expand Down

0 comments on commit d4f62f6

Please sign in to comment.