httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d..@apache.org
Subject svn commit: r1040366 - in /httpd/httpd/trunk/modules/ssl: ssl_toolkit_compat.h ssl_util_stapling.c
Date Tue, 30 Nov 2010 00:50:37 GMT
Author: drh
Date: Tue Nov 30 00:50:36 2010
New Revision: 1040366

URL: http://svn.apache.org/viewvc?rev=1040366&view=rev
Log:
Use correct type, need OPENSSL_STRING for >= 1.0 which doesn't exist on 0.9.8
so #define sk_OPENSSL_STRING_pop to  sk_pop on 0.9.8

Modified:
    httpd/httpd/trunk/modules/ssl/ssl_toolkit_compat.h
    httpd/httpd/trunk/modules/ssl/ssl_util_stapling.c

Modified: httpd/httpd/trunk/modules/ssl/ssl_toolkit_compat.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_toolkit_compat.h?rev=1040366&r1=1040365&r2=1040366&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/ssl_toolkit_compat.h (original)
+++ httpd/httpd/trunk/modules/ssl/ssl_toolkit_compat.h Tue Nov 30 00:50:36 2010
@@ -165,6 +165,9 @@ typedef int (modssl_read_bio_cb_fn)(char
 #if OPENSSL_VERSION_NUMBER >= 0x00908080 && defined(HAVE_OCSP) \
     && !defined(OPENSSL_NO_TLSEXT)
 #define HAVE_OCSP_STAPLING
+#if (OPENSSL_VERSION_NUMBER < 0x10000000)
+#define sk_OPENSSL_STRING_pop sk_pop
+#endif
 #endif
 
 #if (OPENSSL_VERSION_NUMBER >= 0x009080a0) && defined(OPENSSL_FIPS)

Modified: httpd/httpd/trunk/modules/ssl/ssl_util_stapling.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_util_stapling.c?rev=1040366&r1=1040365&r2=1040366&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/ssl_util_stapling.c (original)
+++ httpd/httpd/trunk/modules/ssl/ssl_util_stapling.c Tue Nov 30 00:50:36 2010
@@ -103,7 +103,7 @@ int ssl_stapling_init_cert(server_rec *s
 {
     certinfo *cinf;
     X509 *issuer = NULL;
-    STACK_OF(STRING) *aia = NULL;
+    STACK_OF(OPENSSL_STRING) *aia = NULL;
 
     if (x == NULL)
         return 0;
@@ -139,7 +139,7 @@ int ssl_stapling_init_cert(server_rec *s
 
     aia = X509_get1_ocsp(x);
     if (aia)
-        cinf->uri = sk_STRING_pop(aia);
+        cinf->uri = sk_OPENSSL_STRING_pop(aia);
     if (!cinf->uri && !mctx->stapling_force_url) {
         ap_log_error(APLOG_MARK, APLOG_ERR, 0, s,
                      "ssl_stapling_init_cert: no responder URL");



Mime
View raw message