Commit cfb98546 authored by Doug MacEachern's avatar Doug MacEachern
Browse files

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


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

ssl_toolkit_compat.h

+2 −0
Changes for ssl_toolkit_compat.h: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -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)

ssl_util.c

+3 −1
Changes for ssl_util.c: 3 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -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]);