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

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

Browse Source 
make both happy.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94198 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Doug MacEachern
2002-03-27 01:58:15 +00:00
parent 22c5fe3f27
commit 5bfe936911
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/ssl/mod_ssl.h
View File

@@ -364,6 +364,8 @@ typedef enum {
#define SSL_set_state(ssl,val) (ssl)->state = val #define SSL_set_state(ssl,val) (ssl)->state = val
#define MODSSL_BIO_CB_ARG_TYPE const char
#else #else
/* support some OpenSSL-izms for compat with ssl */ /* support some OpenSSL-izms for compat with ssl */
@@ -372,6 +374,8 @@ typedef enum {
#define STACK_OF(type) STACK #define STACK_OF(type) STACK
#endif #endif
#define MODSSL_BIO_CB_ARG_TYPE char
#endif /* OPENSSL_VERSION_NUMBER */ #endif /* OPENSSL_VERSION_NUMBER */
#define ssl_verify_error_is_optional(errnum) \ #define ssl_verify_error_is_optional(errnum) \
@@ -753,7 +757,7 @@ void ssl_ext_proxy_register(apr_pool_t *p);
/* I/O */ /* I/O */
void ssl_io_filter_init(conn_rec *, SSL *); void ssl_io_filter_init(conn_rec *, SSL *);
void ssl_io_filter_register(apr_pool_t *); 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 */ /* PRNG */
int ssl_rand_seed(server_rec *, apr_pool_t *, ssl_rsctx_t, char *); int ssl_rand_seed(server_rec *, apr_pool_t *, ssl_rsctx_t, char *);

8
modules/ssl/ssl_engine_io.c
View File

@@ -913,7 +913,9 @@ void ssl_io_filter_register(apr_pool_t *p)
#define DUMP_WIDTH 16 #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 buf[256];
char tmp[64]; char tmp[64];
@@ -961,7 +963,9 @@ static void ssl_io_data_dump(server_rec *srvr, const char *s, long len)
return; 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; SSL *ssl;
conn_rec *c; conn_rec *c;