mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2024-11-27 05:21:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

On systems that use case-insensitive symbol names (i.e. they're all

Browse Source 
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.
This commit is contained in:
Richard Levitte 2004-08-12 08:58:55 +00:00
parent bb1a915c24
commit 2549564009
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/s_apps.h
View File

@ -160,7 +160,7 @@ int should_retry(int i);
int extract_port(char *str, short *port_ptr); int extract_port(char *str, short *port_ptr);
int extract_host_port(char *str,char **host_ptr,unsigned char *ip,short *p); 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); int argi, long argl, long ret);
#ifdef HEADER_SSL_H #ifdef HEADER_SSL_H

4
apps/s_cb.c
View File

@ -229,8 +229,8 @@ int set_cert_stuff(SSL_CTX *ctx, char *cert_file, char *key_file)
return(1); return(1);
} }
long MS_CALLBACK bio_dump_cb(BIO *bio, int cmd, const char *argp, int argi, long MS_CALLBACK bio_dump_callback(BIO *bio, int cmd, const char *argp,
long argl, long ret) int argi, long argl, long ret)
{ {
BIO *out; BIO *out;

2
apps/s_client.c
View File

@ -558,7 +558,7 @@ re_start:
if (c_debug) if (c_debug)
{ {
con->debug=1; 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); BIO_set_callback_arg(sbio,bio_c_out);
} }
if (c_msg) if (c_msg)

4
apps/s_server.c
View File

@ -1054,7 +1054,7 @@ static int sv_body(char *hostname, int s, unsigned char *context)
if (s_debug) if (s_debug)
{ {
con->debug=1; 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); BIO_set_callback_arg(SSL_get_rbio(con),bio_s_out);
} }
if (s_msg) if (s_msg)
@ -1457,7 +1457,7 @@ static int www_body(char *hostname, int s, unsigned char *context)
if (s_debug) if (s_debug)
{ {
con->debug=1; 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); BIO_set_callback_arg(SSL_get_rbio(con),bio_s_out);
} }
if (s_msg) if (s_msg)