From 31342ca73d9408b98fc6d6481745b5f76117f136 Mon Sep 17 00:00:00 2001 From: Yann Ylavic Date: Sun, 5 Oct 2014 18:36:02 +0000 Subject: [PATCH] Follow up to r1629372 and r1629485: ensure compatibily with OpenSSL < 1.0 (sk_OPENSSL_STRING_[num|value|pop] macros). git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1629519 13f79535-47bb-0310-9956-ffa450edef68 --- modules/ssl/ssl_private.h | 7 +++++++ modules/ssl/ssl_util_stapling.c | 5 ----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/modules/ssl/ssl_private.h b/modules/ssl/ssl_private.h index 671fa39f3a..546c6e6782 100644 --- a/modules/ssl/ssl_private.h +++ b/modules/ssl/ssl_private.h @@ -151,6 +151,13 @@ /* OCSP stapling */ #if !defined(OPENSSL_NO_OCSP) && defined(SSL_CTX_set_tlsext_status_cb) #define HAVE_OCSP_STAPLING +/* backward compatibility with OpenSSL < 1.0 */ +#ifndef sk_OPENSSL_STRING_num +#define sk_OPENSSL_STRING_num sk_num +#endif +#ifndef sk_OPENSSL_STRING_value +#define sk_OPENSSL_STRING_value sk_value +#endif #ifndef sk_OPENSSL_STRING_pop #define sk_OPENSSL_STRING_pop sk_pop #endif diff --git a/modules/ssl/ssl_util_stapling.c b/modules/ssl/ssl_util_stapling.c index 933d17799c..81e95b41ca 100644 --- a/modules/ssl/ssl_util_stapling.c +++ b/modules/ssl/ssl_util_stapling.c @@ -32,11 +32,6 @@ #include "ap_mpm.h" #include "apr_thread_mutex.h" -#ifndef sk_OPENSSL_STRING_value -/* backward compatibility with OpenSSL < 1.0 */ -#define sk_OPENSSL_STRING_value sk_value -#endif - #ifdef HAVE_OCSP_STAPLING /** -- 2.40.0