diff options
| author | Paul Howarth <paul@city-fan.org> | 2015-04-23 15:56:03 +0200 | 
|---|---|---|
| committer | Kamil Dudka <kdudka@redhat.com> | 2015-04-27 15:37:16 +0200 | 
| commit | d4f62f6c5da7bd3861019b3e0ee777be7b6c4f89 (patch) | |
| tree | 3a668a8625b11357edd8dfec804d7330e5819983 /lib | |
| parent | 1945f99d599a310177ef11cd9d22131bb990845d (diff) | |
nss: fix compilation failure with old versions of NSS
Bug: http://curl.haxx.se/mail/lib-2015-04/0095.html
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/vtls/nss.c | 6 | 
1 files changed, 4 insertions, 2 deletions
| diff --git a/lib/vtls/nss.c b/lib/vtls/nss.c index daf12a9d7..5434ce382 100644 --- a/lib/vtls/nss.c +++ b/lib/vtls/nss.c @@ -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)  { @@ -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) @@ -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) @@ -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; | 
