We now check for OCSP support in configure, so we can lose an OpenSSL version

number check.  Use a type safe STACK.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@832496 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/ssl/ssl_toolkit_compat.h b/modules/ssl/ssl_toolkit_compat.h
index 39850605a707ecef12605a71e711a7b44cf226d7..f1bdebdc3cac24598320fcf01aaa89e49922f626 100644 (file)
--- a/modules/ssl/ssl_toolkit_compat.h
+++ b/modules/ssl/ssl_toolkit_compat.h
@@ -39,8 +39,7 @@
 #include <openssl/rand.h>
 #include <openssl/x509v3.h>
 
-#if OPENSSL_VERSION_NUMBER >= 0x00907000
-#define HAVE_OCSP
+#ifdef HAVE_OCSP
 #include <openssl/x509_vfy.h>
 #include <openssl/ocsp.h>
 #endif

diff --git a/modules/ssl/ssl_util_stapling.c b/modules/ssl/ssl_util_stapling.c
index e622f721893863987dd2dbb6fa70f1a40d06e99e..fccd532ec791a8534ebf918ed95d91b89d1bd1b4 100644 (file)
--- a/modules/ssl/ssl_util_stapling.c
+++ b/modules/ssl/ssl_util_stapling.c
@@ -107,7 +107,7 @@ int ssl_stapling_init_cert(server_rec *s, modssl_ctx_t *mctx, X509 *x)
 {
     certinfo *cinf;
     X509 *issuer = NULL;
-    STACK *aia = NULL;
+    STACK_OF(STRING) *aia = NULL;
 
     if (x == NULL)
         return 0;
@@ -143,7 +143,7 @@ int ssl_stapling_init_cert(server_rec *s, modssl_ctx_t *mctx, X509 *x)
 
     aia = X509_get1_ocsp(x);
     if (aia)
-        cinf->uri = sk_pop(aia);
+        cinf->uri = sk_STRING_pop(aia);
     if (!cinf->uri && !mctx->stapling_force_url) {
         ap_log_error(APLOG_MARK, APLOG_ERR, 0, s,
                      "ssl_stapling_init_cert: no responder URL");