]> granicus.if.org Git - curl/commitdiff
nss: fix compilation failure with old versions of NSS
authorPaul Howarth <paul@city-fan.org>
Thu, 23 Apr 2015 13:56:03 +0000 (15:56 +0200)
committerKamil Dudka <kdudka@redhat.com>
Mon, 27 Apr 2015 13:37:16 +0000 (15:37 +0200)
Bug: http://curl.haxx.se/mail/lib-2015-04/0095.html

lib/vtls/nss.c

index daf12a9d7afafa83afa23e4af402d52a833e652d..5434ce3828078941aff7be07c13fe98fb00b432c 100644 (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,
                                        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;