Re: svn commit: r1740653 - in /httpd/httpd/trunk/modules/ssl: ssl_engine_kernel.c ssl_engine_ocsp.c ssl_private.h ssl_util_stapling.c

[Rainer Jung]

Hi Yann,

Am 29.04.2016 um 09:59 schrieb Yann Ylavic:
On Sat, Apr 23, 2016 at 3:17 PM,  <rj...@apache.org> wrote:
Author: rjung
Date: Sat Apr 23 13:17:52 2016
New Revision: 1740653
URL: http://svn.apache.org/viewvc?rev=1740653&view=rev
Log:
Support for OpenSSL 1.1.0:
- X509_STORE_CTX is now opaque.

Modified:
[]
     httpd/httpd/trunk/modules/ssl/ssl_private.h
[]

Modified: httpd/httpd/trunk/modules/ssl/ssl_private.h
URL: 
http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_private.h?rev=1740653&r1=1740652&r2=1740653&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/ssl_private.h (original)
+++ httpd/httpd/trunk/modules/ssl/ssl_private.h Sat Apr 23 13:17:52 2016
@@ -219,6 +219,16 @@ void init_bio_methods(void);
  void free_bio_methods(void);
  #endif

+#if OPENSSL_VERSION_NUMBER < 0x10002000L
+#define X509_STORE_CTX_get0_store(x) (x->ctx)
+#endif
+
+#if OPENSSL_VERSION_NUMBER < 0x10000000L

0x10100000L ?

Thanks for carefully checking. In this case actually 0x10000000L was 
meant. The function X509_STORE_CTX_get0_current_issuer() has first shown 
up in OpenSSL 1.0.0, but is not available in 0.9.8.

+#ifndef X509_STORE_CTX_get0_current_issuer
+#define X509_STORE_CTX_get0_current_issuer(x) (x->current_issuer)
+#endif
+#endif
+

Regards,

Rainer