You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by do...@apache.org on 2002/03/27 02:58:15 UTC
cvs commit: httpd-2.0/modules/ssl mod_ssl.h ssl_engine_io.c
dougm 02/03/26 17:58:15
Modified: modules/ssl mod_ssl.h ssl_engine_io.c
Log:
3rd arg of BIO callbacks in 'const char' in OpenSSL and 'char' in sslc,
make both happy.
Revision Changes Path
1.88 +5 -1 httpd-2.0/modules/ssl/mod_ssl.h
Index: mod_ssl.h
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/ssl/mod_ssl.h,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- mod_ssl.h 27 Mar 2002 01:28:20 -0000 1.87
+++ mod_ssl.h 27 Mar 2002 01:58:15 -0000 1.88
@@ -364,6 +364,8 @@
#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 @@
#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 @@
/* 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 *);
1.64 +6 -2 httpd-2.0/modules/ssl/ssl_engine_io.c
Index: ssl_engine_io.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_engine_io.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- ssl_engine_io.c 27 Mar 2002 01:50:43 -0000 1.63
+++ ssl_engine_io.c 27 Mar 2002 01:58:15 -0000 1.64
@@ -913,7 +913,9 @@
#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 @@
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;