Follow up to r1629372 and r1629485: ensure compatibily with OpenSSL < 1.0 (sk_OPENSSL...

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

diff --git a/modules/ssl/ssl_private.h b/modules/ssl/ssl_private.h
index 671fa39f3a243b389e5eeafa56c46eaeb50b4c3c..546c6e67829bd9250846190356b83c8ffb94d0dc 100644 (file)
--- 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 933d17799c67d2c1e675275a0442e8f4bd7a0238..81e95b41cad7ee7e653e977f1b13045985fef801 100644 (file)
--- 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
 
 /**