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.

diff --git a/apps/s_apps.h b/apps/s_apps.h
index f4c85aa81f50020c097df9f121e9529e6797815c..b3919b4690ca120b8c60a28a958f78d623d148a2 100644 (file)
--- 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 28f8acc1e30825a984b05a72a94d5b3b61394b04..65cd0ff76be2ed55c2471493fbf35d1d84ca166e 100644 (file)
--- 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 f04080e075e38b7af47a763888321879af8d8ce2..603d8ce6b194407e261933ec459295a42981817c 100644 (file)
--- 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 cc2c10d10cfbcde754bb4f97ab1ae445dc50dd38..cce835c23902d53c43b3038011c74b9f5056547e 100644 (file)
--- 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)