sslc adds a second, unused param to X509_verify_cert

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

diff --git a/modules/ssl/ssl_engine_kernel.c b/modules/ssl/ssl_engine_kernel.c
index 540f203d54a0244d522413df7cd23f52adb05645..e839d086cc8e3ac5d8a143a0db4cc87e0be0ae60 100644 (file)
--- a/modules/ssl/ssl_engine_kernel.c
+++ b/modules/ssl/ssl_engine_kernel.c
@@ -755,7 +755,7 @@ int ssl_hook_Access(request_rec *r)
                                        SSL_get_ex_data_X509_STORE_CTX_idx(),
                                        (char *)ssl);
 
-            if (!X509_verify_cert(&cert_store_ctx)) {
+            if (!modssl_X509_verify_cert(&cert_store_ctx)) {
                 ssl_log(r->server, SSL_LOG_ERROR|SSL_ADD_SSLERR, 
                         "Re-negotiation verification step failed");
             }

diff --git a/modules/ssl/ssl_toolkit_compat.h b/modules/ssl/ssl_toolkit_compat.h
index 7b2205f6ff8818352ed9b51dec73ea9c4b9f23e7..06f9b5a6e1680004e6a08c256e0669c55dca4d9a 100644 (file)
--- a/modules/ssl/ssl_toolkit_compat.h
+++ b/modules/ssl/ssl_toolkit_compat.h
@@ -45,6 +45,8 @@
 
 #define MODSSL_BIO_CB_ARG_TYPE const char
 
+#define modssl_X509_verify_cert(c) X509_verify_cert(c)
+
 #else /* RSA sslc */
 
 #ifndef STACK_OF
@@ -53,6 +55,8 @@
 
 #define MODSSL_BIO_CB_ARG_TYPE char
 
+#define modssl_X509_verify_cert(c) X509_verify_cert(c, NULL)
+
 #if SSLC_VERSION < 0x2000
 
 #define X509_STORE_CTX_set_depth(st, d)