Commit 035f027d authored by Doug MacEachern's avatar Doug MacEachern
Browse files

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
parent 77b5a643

ssl_engine_io.c

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