From 8abd8d66b331d74d7d044c52d3e72bfae43281e4 Mon Sep 17 00:00:00 2001 From: Sander Temme Date: Tue, 3 Nov 2009 18:19:33 +0000 Subject: [PATCH] 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 --- modules/ssl/ssl_toolkit_compat.h | 3 +-- modules/ssl/ssl_util_stapling.c | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/modules/ssl/ssl_toolkit_compat.h b/modules/ssl/ssl_toolkit_compat.h index 39850605a7..f1bdebdc3c 100644 --- a/modules/ssl/ssl_toolkit_compat.h +++ b/modules/ssl/ssl_toolkit_compat.h @@ -39,8 +39,7 @@ #include #include -#if OPENSSL_VERSION_NUMBER >= 0x00907000 -#define HAVE_OCSP +#ifdef HAVE_OCSP #include #include #endif diff --git a/modules/ssl/ssl_util_stapling.c b/modules/ssl/ssl_util_stapling.c index e622f72189..fccd532ec7 100644 --- 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"); -- 2.40.0