[trafficserver] branch master updated: build: Require OCSP headers for OCSP-enablement

[rr...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rrm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/master by this push:
     new b0a42ab  build: Require OCSP headers for OCSP-enablement
b0a42ab is described below

commit b0a42aba80db3eb82d23c598d51f42f8be906d50
Author: Randall Meyer <rr...@apache.org>
AuthorDate: Fri Jun 19 11:16:43 2020 -0700

    build: Require OCSP headers for OCSP-enablement
    
    This fixes a false detection of OCSP when the headers are not present,
    but the found libraries contain OCSP symbols
---
 build/crypto.m4 | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/build/crypto.m4 b/build/crypto.m4
index 64787b4..331be06 100644
--- a/build/crypto.m4
+++ b/build/crypto.m4
@@ -259,10 +259,13 @@ AC_DEFUN([TS_CHECK_CRYPTO_OCSP], [
   _ocsp_saved_LIBS=$LIBS
 
   TS_ADDTO(LIBS, [$OPENSSL_LIBS])
-  AC_CHECK_HEADERS(openssl/ocsp.h)
-  AC_CHECK_FUNCS(OCSP_sendreq_new OCSP_REQ_CTX_add1_header OCSP_REQ_CTX_set1_req, [enable_tls_ocsp=yes], [enable_tls_ocsp=no])
+  AC_CHECK_HEADERS(openssl/ocsp.h, [ocsp_have_headers=1], [enable_tls_ocsp=no])
 
-  LIBS=$_ocsp_saved_LIBS
+  if test "$ocsp_have_headers" == "1"; then
+    AC_CHECK_FUNCS(OCSP_sendreq_new OCSP_REQ_CTX_add1_header OCSP_REQ_CTX_set1_req, [enable_tls_ocsp=yes], [enable_tls_ocsp=no])
+
+    LIBS=$_ocsp_saved_LIBS
+  fi
 
   AC_MSG_CHECKING(whether OCSP is supported)
   AC_MSG_RESULT([$enable_tls_ocsp])