www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00
Code Activity

Fix compiler warning when using OpenSSL 1.1.0.

Browse Source 
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
This commit is contained in:
Rainer Jung
2016-02-09 18:10:11 +00:00
parent 8350ace9c7
commit 3afb174383
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/ssl/ssl_private.h
View File

@@ -151,6 +151,7 @@
/* OCSP stapling */ /* OCSP stapling */
#if !defined(OPENSSL_NO_OCSP) && defined(SSL_CTX_set_tlsext_status_cb) #if !defined(OPENSSL_NO_OCSP) && defined(SSL_CTX_set_tlsext_status_cb)
#define HAVE_OCSP_STAPLING #define HAVE_OCSP_STAPLING
#if OPENSSL_VERSION_NUMBER < 0x10100000L
/* backward compatibility with OpenSSL < 1.0 */ /* backward compatibility with OpenSSL < 1.0 */
#ifndef sk_OPENSSL_STRING_num #ifndef sk_OPENSSL_STRING_num
#define sk_OPENSSL_STRING_num sk_num #define sk_OPENSSL_STRING_num sk_num
@@ -161,7 +162,8 @@
#ifndef sk_OPENSSL_STRING_pop #ifndef sk_OPENSSL_STRING_pop
#define sk_OPENSSL_STRING_pop sk_pop #define sk_OPENSSL_STRING_pop sk_pop
#endif #endif
#endif #endif /* if OPENSSL_VERSION_NUMBER < 0x10100000L */
#endif /* if !defined(OPENSSL_NO_OCSP) && defined(SSL_CTX_set_tlsext_status_cb) */
/* TLS session tickets */ /* TLS session tickets */
#if defined(SSL_CTX_set_tlsext_ticket_key_cb) #if defined(SSL_CTX_set_tlsext_ticket_key_cb)

4
modules/ssl/ssl_util_stapling.c
View File

@@ -172,10 +172,6 @@ int ssl_stapling_init_cert(server_rec *s, apr_pool_t *p, apr_pool_t *ptemp,
apr_pool_cleanup_null); apr_pool_cleanup_null);
if (aia) { if (aia) {
/* allocate uri from the pconf pool */ /* 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)); cinf->uri = apr_pstrdup(p, sk_OPENSSL_STRING_value(aia, 0));
X509_email_free(aia); X509_email_free(aia);
} }