1
0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00

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@94197 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Doug MacEachern
2002-03-27 01:50:43 +00:00
parent ebe92b6f8b
commit 22c5fe3f27

View 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->pInputFilter = ap_add_input_filter(ssl_io_filter, ctx, NULL, c);
frec->pbioRead = BIO_new(BIO_s_in_bucket()); frec->pbioRead = BIO_new(BIO_s_in_bucket());
frec->pbioRead->ptr = &ctx->inbio; frec->pbioRead->ptr = (void *)&ctx->inbio;
ctx->frec = frec; ctx->frec = frec;
ctx->inbio.ssl = ssl; ctx->inbio.ssl = ssl;
@@ -880,7 +880,7 @@ void ssl_io_filter_init(conn_rec *c, SSL *ssl)
filter, NULL, c); filter, NULL, c);
filter->pbioWrite = BIO_new(BIO_s_bucket()); 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); 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) { if (sc->nLogLevel >= SSL_LOG_DEBUG) {
BIO_set_callback(SSL_get_rbio(ssl), ssl_io_data_cb); 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; return;