From: Doug MacEachern <dougm@apache.org>
Date: Wed, 27 Mar 2002 01:50:43 +0000 (+0000)
Subject: OpenSSL uses void * for callback data, sslc uses char *,
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=035f027d80348bc723eefc663a334427acea1521;p=thirdparty%2Fapache%2Fhttpd.git

OpenSSL uses void * for callback data, sslc uses char *,
cast to void * to make both happy.


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

diff --git a/ssl_engine_io.c b/ssl_engine_io.c
index ea8d4391328..cd3212546da 100644
--- a/ssl_engine_io.c
+++ b/ssl_engine_io.c
@@ -836,7 +836,7 @@ static void ssl_io_input_add_filter(SSLFilterRec *frec, conn_rec *c,
     frec->pInputFilter = ap_add_input_filter(ssl_io_filter, ctx, NULL, c);
 
     frec->pbioRead = BIO_new(BIO_s_in_bucket());
-    frec->pbioRead->ptr = &ctx->inbio;
+    frec->pbioRead->ptr = (void *)&ctx->inbio;
 
     ctx->frec = frec;
     ctx->inbio.ssl = ssl;
@@ -880,7 +880,7 @@ void ssl_io_filter_init(conn_rec *c, SSL *ssl)
                                                    filter, NULL, c);
 
     filter->pbioWrite       = BIO_new(BIO_s_bucket());
-    filter->pbioWrite->ptr  = BIO_bucket_new(filter, c);
+    filter->pbioWrite->ptr  = (void *)BIO_bucket_new(filter, c);
 
     ssl_io_input_add_filter(filter, c, ssl);
 
@@ -892,7 +892,7 @@ void ssl_io_filter_init(conn_rec *c, SSL *ssl)
 
     if (sc->nLogLevel >= SSL_LOG_DEBUG) {
         BIO_set_callback(SSL_get_rbio(ssl), ssl_io_data_cb);
-        BIO_set_callback_arg(SSL_get_rbio(ssl), ssl);
+        BIO_set_callback_arg(SSL_get_rbio(ssl), (void *)ssl);
     }
 
     return;