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

3rd arg of BIO callbacks in 'const char' in OpenSSL and 'char' in sslc, 

make both happy.


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

mod_ssl.h

+5 −1
Changes for mod_ssl.h: 5 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -364,6 +364,8 @@ typedef enum { 


#define SSL_set_state(ssl,val) (ssl)->state = val



#define MODSSL_BIO_CB_ARG_TYPE const char



#else



/* support some OpenSSL-izms for compat with ssl */
@@ -372,6 +374,8 @@ typedef enum { 
#define STACK_OF(type) STACK

#endif



#define MODSSL_BIO_CB_ARG_TYPE char



#endif /* OPENSSL_VERSION_NUMBER */



#define ssl_verify_error_is_optional(errnum) \
@@ -753,7 +757,7 @@ void ssl_ext_proxy_register(apr_pool_t *p); 
/*  I/O  */

void         ssl_io_filter_init(conn_rec *, SSL *);

void         ssl_io_filter_register(apr_pool_t *);

long         ssl_io_data_cb(BIO *, int, const char *, int, long, long);

long         ssl_io_data_cb(BIO *, int, MODSSL_BIO_CB_ARG_TYPE *, int, long, long);



/*  PRNG  */

int          ssl_rand_seed(server_rec *, apr_pool_t *, ssl_rsctx_t, char *);

ssl_engine_io.c

+6 −2
Changes for ssl_engine_io.c: 6 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -913,7 +913,9 @@ void ssl_io_filter_register(apr_pool_t *p) 


#define DUMP_WIDTH 16



static void ssl_io_data_dump(server_rec *srvr, const char *s, long len)

static void ssl_io_data_dump(server_rec *srvr,

                             MODSSL_BIO_CB_ARG_TYPE *s,

                             long len)

{

    char buf[256];

    char tmp[64];
@@ -961,7 +963,9 @@ static void ssl_io_data_dump(server_rec *srvr, const char *s, long len) 
    return;

}



long ssl_io_data_cb(BIO *bio, int cmd, const char *argp, int argi, long argl, long rc)

long ssl_io_data_cb(BIO *bio, int cmd,

                    MODSSL_BIO_CB_ARG_TYPE *argp,

                    int argi, long argl, long rc)

{

    SSL *ssl;

    conn_rec *c;