adjust to another const char vs char mismatch between OpenSSL and sslc

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

diff --git a/modules/ssl/ssl_toolkit_compat.h b/modules/ssl/ssl_toolkit_compat.h
index f297947f0be5a491b4c43d785ea8eb4d63636798..dc94f053c771c594f8b175d3734bcd71bd4a2745 100644 (file)
--- a/modules/ssl/ssl_toolkit_compat.h
+++ b/modules/ssl/ssl_toolkit_compat.h
@@ -44,6 +44,7 @@
 #define SSL_set_state(ssl,val) (ssl)->state = val
 
 #define MODSSL_BIO_CB_ARG_TYPE const char
+#define MODSSL_CRYPTO_CB_ARG_TYPE const char
 
 #define modssl_X509_verify_cert(c) X509_verify_cert(c)
 
@@ -61,6 +62,7 @@
 #endif
 
 #define MODSSL_BIO_CB_ARG_TYPE char
+#define MODSSL_CRYPTO_CB_ARG_TYPE char
 
 #define modssl_X509_verify_cert(c) X509_verify_cert(c, NULL)
 

diff --git a/modules/ssl/ssl_util.c b/modules/ssl/ssl_util.c
index 3ef632a81d911f370b9ae716d8748981ac22dd0c..f617096600e81b05add262044cb7c0e240ea855f 100644 (file)
--- a/modules/ssl/ssl_util.c
+++ b/modules/ssl/ssl_util.c
@@ -404,7 +404,9 @@ static apr_thread_mutex_t **lock_cs;
    CRYPT_num_locks() [Ben, Jan 2002] */
 static long                 lock_count[CRYPTO_NUM_LOCKS];
 
-static void ssl_util_thr_lock(int mode, int type, const char *file, int line)
+static void ssl_util_thr_lock(int mode, int type,
+                              MODSSL_CRYPTO_CB_ARG_TYPE *file,
+                              int line)
 {
     if (mode & CRYPTO_LOCK) {
         apr_thread_mutex_lock(lock_cs[type]);