Fix compiler warning when using OpenSSL 1.1.0.

The old compatibility macro check no longer works,
because those are now actual functions, so an
ifndef is not the correct check.

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

diff --git a/modules/ssl/ssl_private.h b/modules/ssl/ssl_private.h
index 91625a7b374f94b8828fecb45a3aac77a9cef466..d70d625d139fd94aaf2dfac64bed37e27a1b3bb0 100644 (file)
--- a/modules/ssl/ssl_private.h
+++ b/modules/ssl/ssl_private.h
@@ -151,6 +151,7 @@
 /* OCSP stapling */
 #if !defined(OPENSSL_NO_OCSP) && defined(SSL_CTX_set_tlsext_status_cb)
 #define HAVE_OCSP_STAPLING
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
 /* backward compatibility with OpenSSL < 1.0 */
 #ifndef sk_OPENSSL_STRING_num
 #define sk_OPENSSL_STRING_num sk_num
@@ -161,7 +162,8 @@
 #ifndef sk_OPENSSL_STRING_pop
 #define sk_OPENSSL_STRING_pop sk_pop
 #endif
-#endif
+#endif /* if OPENSSL_VERSION_NUMBER < 0x10100000L */
+#endif /* if !defined(OPENSSL_NO_OCSP) && defined(SSL_CTX_set_tlsext_status_cb) */
 
 /* TLS session tickets */
 #if defined(SSL_CTX_set_tlsext_ticket_key_cb)

diff --git a/modules/ssl/ssl_util_stapling.c b/modules/ssl/ssl_util_stapling.c
index 1226d9bfde4b0331aeacd13f85ed0bf4ffff1b0c..57a753c16f66ba2ea7a6e41de09b5fc7ebcc58aa 100644 (file)
--- a/modules/ssl/ssl_util_stapling.c
+++ b/modules/ssl/ssl_util_stapling.c
@@ -172,10 +172,6 @@ int ssl_stapling_init_cert(server_rec *s, apr_pool_t *p, apr_pool_t *ptemp,
                               apr_pool_cleanup_null);
     if (aia) {
        /* allocate uri from the pconf pool */
-       /* XXX: OpenSSL 1.1.0: Compiler warning: passing argument 1 of 'sk_value'
-        * from incompatible pointer type expected 'const struct _STACK *'
-        * but argument is of type 'struct stack_st_OPENSSL_STRING *'
-        */
        cinf->uri = apr_pstrdup(p, sk_OPENSSL_STRING_value(aia, 0));
        X509_email_free(aia);
     }