Commit 25495640 authored by Richard Levitte's avatar Richard Levitte
Browse files

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.
parent bb1a915c

apps/s_apps.h

+1 −1
Original line number Diff line number Diff line
@@ -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

apps/s_cb.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

apps/s_client.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

apps/s_server.c

+2 −2
Original line number Diff line number Diff line
@@ -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)