]> granicus.if.org Git - apache/commitdiff
OpenSSL uses void * for callback data, sslc uses char *,
authorDoug MacEachern <dougm@apache.org>
Wed, 27 Mar 2002 01:50:43 +0000 (01:50 +0000)
committerDoug MacEachern <dougm@apache.org>
Wed, 27 Mar 2002 01:50:43 +0000 (01:50 +0000)
cast to void * to make both happy.

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

modules/ssl/ssl_engine_io.c

index ea8d4391328d2a689f5bb3f3fbc7826dcd2eb21b..cd3212546da7c6b580e2996563240d6203f24a01 100644 (file)
@@ -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;