sslc 1.x SSL_set_verify only takes 2 args

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

diff --git a/modules/ssl/ssl_engine_kernel.c b/modules/ssl/ssl_engine_kernel.c
index e839d086cc8e3ac5d8a143a0db4cc87e0be0ae60..f26a3ffb90fe8922b2b966a81571945e40cb8c40 100644 (file)
--- a/modules/ssl/ssl_engine_kernel.c
+++ b/modules/ssl/ssl_engine_kernel.c
@@ -539,7 +539,7 @@ int ssl_hook_Access(request_rec *r)
             verify |= SSL_VERIFY_PEER;
         }
 
-        SSL_set_verify(ssl, verify, ssl_callback_SSLVerify);
+        modssl_set_verify(ssl, verify, ssl_callback_SSLVerify);
         SSL_set_verify_result(ssl, X509_V_OK);
 
         /* determine whether we've to force a renegotiation */

diff --git a/modules/ssl/ssl_toolkit_compat.h b/modules/ssl/ssl_toolkit_compat.h
index ba9da85fcd8c7eecdfe878c6a9df3fdee82bf7a7..6b225d83087165f268c84e1f01b784873db69178 100644 (file)
--- a/modules/ssl/ssl_toolkit_compat.h
+++ b/modules/ssl/ssl_toolkit_compat.h
@@ -70,6 +70,9 @@
 #define X509_CRL_get_REVOKED(x)    ((x)->crl->revoked)
 #define X509_REVOKED_get_serialNumber(xs) (xs->serialNumber)
 
+#define modssl_set_verify(ssl, verify, cb) \
+    SSL_set_verify(ssl, verify)
+
 #endif
 
 /* BEGIN GENERATED SECTION */
@@ -99,4 +102,9 @@
 
 #endif /* OPENSSL_VERSION_NUMBER */
 
+#ifndef modssl_set_verify
+#define modssl_set_verify(ssl, verify, cb) \
+    SSL_set_verify(ssl, verify, cb)
+#endif
+
 #endif /* SSL_TOOLKIT_COMPAT_H */