generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

nss: fix compilation failure with old versions of NSS

Browse Source 
Bug: http://curl.haxx.se/mail/lib-2015-04/0095.html
This commit is contained in:
Paul Howarth
2015-04-23 15:56:03 +02:00
committed by Kamil Dudka
parent 1945f99d59
commit d4f62f6c5d
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/vtls/nss.c
View File

@@ -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;