diff options
| author | Richard Levitte <levitte@openssl.org> | 2004-08-12 08:58:55 +0000 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2004-08-12 08:58:55 +0000 |
| commit | 25495640096acea0be812cb1797ea5fbfb14363b (patch) | |
| tree | 5f2a89f3aee79ae07ad079783271b0d35534b123 | |
| parent | bb1a915c24121e5278d7feeab7c96d06197999b9 (diff) | |
On systems that use case-insensitive symbol names (i.e. they're all
converted to upper case or something like that), the application-
level bio_dump_cb() has a name clash with the new library function
BIO_dump_cb(). The easiest fix is to rename the function at the
application level.
| -rw-r--r-- | apps/s_apps.h | 2 | ||||
| -rw-r--r-- | apps/s_cb.c | 4 | ||||
| -rw-r--r-- | apps/s_client.c | 2 | ||||
| -rw-r--r-- | apps/s_server.c | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/apps/s_apps.h b/apps/s_apps.h index f4c85aa81f..b3919b4690 100644 --- a/apps/s_apps.h +++ b/apps/s_apps.h @@ -160,7 +160,7 @@ int should_retry(int i); int extract_port(char *str, short *port_ptr); int extract_host_port(char *str,char **host_ptr,unsigned char *ip,short *p); -long MS_CALLBACK bio_dump_cb(BIO *bio, int cmd, const char *argp, +long MS_CALLBACK bio_dump_callback(BIO *bio, int cmd, const char *argp, int argi, long argl, long ret); #ifdef HEADER_SSL_H diff --git a/apps/s_cb.c b/apps/s_cb.c index 28f8acc1e3..65cd0ff76b 100644 --- a/apps/s_cb.c +++ b/apps/s_cb.c @@ -229,8 +229,8 @@ int set_cert_stuff(SSL_CTX *ctx, char *cert_file, char *key_file) return(1); } -long MS_CALLBACK bio_dump_cb(BIO *bio, int cmd, const char *argp, int argi, - long argl, long ret) +long MS_CALLBACK bio_dump_callback(BIO *bio, int cmd, const char *argp, + int argi, long argl, long ret) { BIO *out; diff --git a/apps/s_client.c b/apps/s_client.c index f04080e075..603d8ce6b1 100644 --- a/apps/s_client.c +++ b/apps/s_client.c @@ -558,7 +558,7 @@ re_start: if (c_debug) { con->debug=1; - BIO_set_callback(sbio,bio_dump_cb); + BIO_set_callback(sbio,bio_dump_callback); BIO_set_callback_arg(sbio,bio_c_out); } if (c_msg) diff --git a/apps/s_server.c b/apps/s_server.c index cc2c10d10c..cce835c239 100644 --- a/apps/s_server.c +++ b/apps/s_server.c @@ -1054,7 +1054,7 @@ static int sv_body(char *hostname, int s, unsigned char *context) if (s_debug) { con->debug=1; - BIO_set_callback(SSL_get_rbio(con),bio_dump_cb); + BIO_set_callback(SSL_get_rbio(con),bio_dump_callback); BIO_set_callback_arg(SSL_get_rbio(con),bio_s_out); } if (s_msg) @@ -1457,7 +1457,7 @@ static int www_body(char *hostname, int s, unsigned char *context) if (s_debug) { con->debug=1; - BIO_set_callback(SSL_get_rbio(con),bio_dump_cb); + BIO_set_callback(SSL_get_rbio(con),bio_dump_callback); BIO_set_callback_arg(SSL_get_rbio(con),bio_s_out); } if (s_msg) |