replace macros with functions (7806f3dd) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP OpenSSL

apps/dgst.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -264,7 +264,7 @@ int MAIN(int argc, char **argv)
		{
		BIO_set_callback(in,BIO_debug_callback);
		/* needed for windows 3.1 */
		BIO_set_callback_arg(in,bio_err);
		BIO_set_callback_arg(in,(char *)bio_err);
		}

		if(!app_passwd(bio_err, passargin, NULL, &passin, NULL))

apps/enc.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -365,8 +365,8 @@ bad:
		{
		BIO_set_callback(in,BIO_debug_callback);
		BIO_set_callback(out,BIO_debug_callback);
		BIO_set_callback_arg(in,bio_err);
		BIO_set_callback_arg(out,bio_err);
		BIO_set_callback_arg(in,(char *)bio_err);
		BIO_set_callback_arg(out,(char *)bio_err);
		}

		if (inf == NULL)
		@@ -453,7 +453,7 @@ bad:
		if (debug)
		{
		BIO_set_callback(b64,BIO_debug_callback);
		BIO_set_callback_arg(b64,bio_err);
		BIO_set_callback_arg(b64,(char *)bio_err);
		}
		if (olb64)
		BIO_set_flags(b64,BIO_FLAGS_BASE64_NO_NL);
		@@ -571,7 +571,7 @@ bad:
		if (debug)
		{
		BIO_set_callback(benc,BIO_debug_callback);
		BIO_set_callback_arg(benc,bio_err);
		BIO_set_callback_arg(benc,(char *)bio_err);
		}

		if (printkey)

apps/s_client.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -872,7 +872,7 @@ re_start:
		{
		con->debug=1;
		BIO_set_callback(sbio,bio_dump_callback);
		BIO_set_callback_arg(sbio,bio_c_out);
		BIO_set_callback_arg(sbio,(char *)bio_c_out);
		}
		if (c_msg)
		{

apps/s_server.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1602,7 +1602,7 @@ static int sv_body(char hostname, int s, unsigned char context)
		{
		con->debug=1;
		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),(char *)bio_s_out);
		}
		if (s_msg)
		{
		@@ -2020,7 +2020,7 @@ static int www_body(char hostname, int s, unsigned char context)
		{
		con->debug=1;
		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),(char *)bio_s_out);
		}
		if (s_msg)
		{

crypto/bio/bio.h

+24 −20

Original line number	Diff line number	Diff line
		@@ -196,28 +196,32 @@ extern "C" {
		*/
		#define BIO_FLAGS_MEM_RDONLY 0x200

		#define BIO_set_flags(b,f) ((b)->flags\|=(f))
		#define BIO_get_flags(b) ((b)->flags)
		typedef struct bio_st BIO;

		void BIO_set_flags(BIO *b, int flags);
		int BIO_test_flags(const BIO *b, int flags);
		void BIO_clear_flags(BIO *b, int flags);

		#define BIO_get_flags(b) BIO_test_flags(b, ~(0x0))
		#define BIO_set_retry_special(b) \
		((b)->flags\|=(BIO_FLAGS_IO_SPECIAL\|BIO_FLAGS_SHOULD_RETRY))
		BIO_set_flags(b, (BIO_FLAGS_IO_SPECIAL\|BIO_FLAGS_SHOULD_RETRY))
		#define BIO_set_retry_read(b) \
		((b)->flags\|=(BIO_FLAGS_READ\|BIO_FLAGS_SHOULD_RETRY))
		BIO_set_flags(b, (BIO_FLAGS_READ\|BIO_FLAGS_SHOULD_RETRY))
		#define BIO_set_retry_write(b) \
		((b)->flags\|=(BIO_FLAGS_WRITE\|BIO_FLAGS_SHOULD_RETRY))
		BIO_set_flags(b, (BIO_FLAGS_WRITE\|BIO_FLAGS_SHOULD_RETRY))

		/* These are normally used internally in BIOs */
		#define BIO_clear_flags(b,f) ((b)->flags&= ~(f))
		#define BIO_clear_retry_flags(b) \
		((b)->flags&= ~(BIO_FLAGS_RWS\|BIO_FLAGS_SHOULD_RETRY))
		BIO_clear_flags(b, (BIO_FLAGS_RWS\|BIO_FLAGS_SHOULD_RETRY))
		#define BIO_get_retry_flags(b) \
		((b)->flags&(BIO_FLAGS_RWS\|BIO_FLAGS_SHOULD_RETRY))
		BIO_test_flags(b, (BIO_FLAGS_RWS\|BIO_FLAGS_SHOULD_RETRY))

		/* These should be used by the application to tell why we should retry */
		#define BIO_should_read(a) ((a)->flags & BIO_FLAGS_READ)
		#define BIO_should_write(a) ((a)->flags & BIO_FLAGS_WRITE)
		#define BIO_should_io_special(a) ((a)->flags & BIO_FLAGS_IO_SPECIAL)
		#define BIO_retry_type(a) ((a)->flags & BIO_FLAGS_RWS)
		#define BIO_should_retry(a) ((a)->flags & BIO_FLAGS_SHOULD_RETRY)
		#define BIO_should_read(a) BIO_test_flags(a, BIO_FLAGS_READ)
		#define BIO_should_write(a) BIO_test_flags(a, BIO_FLAGS_WRITE)
		#define BIO_should_io_special(a) BIO_test_flags(a, BIO_FLAGS_IO_SPECIAL)
		#define BIO_retry_type(a) BIO_test_flags(a, BIO_FLAGS_RWS)
		#define BIO_should_retry(a) BIO_test_flags(a, BIO_FLAGS_SHOULD_RETRY)

		/* The next three are used in conjunction with the
		* BIO_should_io_special() condition. After this returns true,
		@@ -246,14 +250,14 @@ extern "C" {
		#define BIO_cb_pre(a) (!((a)&BIO_CB_RETURN))
		#define BIO_cb_post(a) ((a)&BIO_CB_RETURN)

		#define BIO_set_callback(b,cb) ((b)->callback=(cb))
		#define BIO_set_callback_arg(b,arg) ((b)->cb_arg=(char *)(arg))
		#define BIO_get_callback_arg(b) ((b)->cb_arg)
		#define BIO_get_callback(b) ((b)->callback)
		#define BIO_method_name(b) ((b)->method->name)
		#define BIO_method_type(b) ((b)->method->type)
		long (BIO_get_callback(const BIO b)) (struct bio_st ,int,const char ,int, long,long);
		void BIO_set_callback(BIO *b,
		long (callback)(struct bio_st ,int,const char *,int, long,long));
		char BIO_get_callback_arg(const BIO b);
		void BIO_set_callback_arg(BIO b, char arg);

		typedef struct bio_st BIO;
		const char * BIO_method_name(const BIO *b);
		int BIO_method_type(const BIO *b);

		typedef void bio_info_cb(struct bio_st , int, const char , int, long, long);