]> granicus.if.org Git - curl/commitdiff
openssl: Fixed compilation errors when OpenSSL built with 'no-tlsext'
authorSteve Holme <steve_holme@hotmail.com>
Tue, 27 Jan 2015 11:52:14 +0000 (11:52 +0000)
committerSteve Holme <steve_holme@hotmail.com>
Tue, 27 Jan 2015 12:47:48 +0000 (12:47 +0000)
Fixed the build of openssl.c when OpenSSL is built without the necessary
TLS extensions for OCSP stapling.

Reported-by: John E. Malmberg
lib/vtls/openssl.c

index 2bb76aebe8a79d5c4bc91eaf35d8c7f032ab964e..fb19ab1aef581eac6446243996e3e4b88ce22488 100644 (file)
@@ -1323,7 +1323,7 @@ static CURLcode verifyhost(struct connectdata *conn, X509 *server_cert)
   return result;
 }
 
-#ifndef HAVE_BORINGSSL
+#if !defined(HAVE_BORINGSSL) && !defined(OPENSSL_NO_TLSEXT)
 static CURLcode verifystatus(struct connectdata *conn,
                              struct ssl_connect_data *connssl)
 {
@@ -2060,7 +2060,7 @@ static CURLcode ossl_connect_step1(struct connectdata *conn, int sockindex)
     return CURLE_OUT_OF_MEMORY;
   }
 
-#ifndef HAVE_BORINGSSL
+#if !defined(HAVE_BORINGSSL) && !defined(OPENSSL_NO_TLSEXT)
   if(data->set.ssl.verifystatus)
     SSL_set_tlsext_status_type(connssl->handle, TLSEXT_STATUSTYPE_ocsp);
 #endif
@@ -2748,7 +2748,7 @@ static CURLcode servercert(struct connectdata *conn,
       infof(data, "\t SSL certificate verify ok.\n");
   }
 
-#ifndef HAVE_BORINGSSL
+#if !defined(HAVE_BORINGSSL) && !defined(OPENSSL_NO_TLSEXT)
   if(data->set.ssl.verifystatus) {
     result = verifystatus(conn, connssl);
     if(result) {