Commit 08e55364 authored by Ben Laurie's avatar Ben Laurie
Browse files

Fix some clang warnings.

parent e54e1235

crypto/md4/md4_dgst.c

+16 −15
Original line number Diff line number Diff line
@@ -105,22 +105,23 @@ void md4_block_data_order (MD4_CTX *c, const void *data_, size_t num) 


	for (;num--;)

		{

	HOST_c2l(data,l); X( 0)=l;		HOST_c2l(data,l); X( 1)=l;

	(void)HOST_c2l(data,l); X( 0)=l;

	(void)HOST_c2l(data,l); X( 1)=l;

	/* Round 0 */

	R0(A,B,C,D,X( 0), 3,0);	HOST_c2l(data,l); X( 2)=l;

	R0(D,A,B,C,X( 1), 7,0);	HOST_c2l(data,l); X( 3)=l;

	R0(C,D,A,B,X( 2),11,0);	HOST_c2l(data,l); X( 4)=l;

	R0(B,C,D,A,X( 3),19,0);	HOST_c2l(data,l); X( 5)=l;

	R0(A,B,C,D,X( 4), 3,0);	HOST_c2l(data,l); X( 6)=l;

	R0(D,A,B,C,X( 5), 7,0);	HOST_c2l(data,l); X( 7)=l;

	R0(C,D,A,B,X( 6),11,0);	HOST_c2l(data,l); X( 8)=l;

	R0(B,C,D,A,X( 7),19,0);	HOST_c2l(data,l); X( 9)=l;

	R0(A,B,C,D,X( 8), 3,0);	HOST_c2l(data,l); X(10)=l;

	R0(D,A,B,C,X( 9), 7,0);	HOST_c2l(data,l); X(11)=l;

	R0(C,D,A,B,X(10),11,0);	HOST_c2l(data,l); X(12)=l;

	R0(B,C,D,A,X(11),19,0);	HOST_c2l(data,l); X(13)=l;

	R0(A,B,C,D,X(12), 3,0);	HOST_c2l(data,l); X(14)=l;

	R0(D,A,B,C,X(13), 7,0);	HOST_c2l(data,l); X(15)=l;

	R0(A,B,C,D,X( 0), 3,0);	(void)HOST_c2l(data,l); X( 2)=l;

	R0(D,A,B,C,X( 1), 7,0);	(void)HOST_c2l(data,l); X( 3)=l;

	R0(C,D,A,B,X( 2),11,0);	(void)HOST_c2l(data,l); X( 4)=l;

	R0(B,C,D,A,X( 3),19,0);	(void)HOST_c2l(data,l); X( 5)=l;

	R0(A,B,C,D,X( 4), 3,0);	(void)HOST_c2l(data,l); X( 6)=l;

	R0(D,A,B,C,X( 5), 7,0);	(void)HOST_c2l(data,l); X( 7)=l;

	R0(C,D,A,B,X( 6),11,0);	(void)HOST_c2l(data,l); X( 8)=l;

	R0(B,C,D,A,X( 7),19,0);	(void)HOST_c2l(data,l); X( 9)=l;

	R0(A,B,C,D,X( 8), 3,0);	(void)HOST_c2l(data,l); X(10)=l;

	R0(D,A,B,C,X( 9), 7,0);	(void)HOST_c2l(data,l); X(11)=l;

	R0(C,D,A,B,X(10),11,0);	(void)HOST_c2l(data,l); X(12)=l;

	R0(B,C,D,A,X(11),19,0);	(void)HOST_c2l(data,l); X(13)=l;

	R0(A,B,C,D,X(12), 3,0);	(void)HOST_c2l(data,l); X(14)=l;

	R0(D,A,B,C,X(13), 7,0);	(void)HOST_c2l(data,l); X(15)=l;

	R0(C,D,A,B,X(14),11,0);

	R0(B,C,D,A,X(15),19,0);

	/* Round 1 */

crypto/md4/md4_locl.h

+4 −4
Original line number Diff line number Diff line
@@ -77,10 +77,10 @@ void md4_block_data_order (MD4_CTX *c, const void *p,size_t num); 
#define HASH_FINAL		MD4_Final

#define	HASH_MAKE_STRING(c,s)	do {	\

	unsigned long ll;		\

	ll=(c)->A; HOST_l2c(ll,(s));	\

	ll=(c)->B; HOST_l2c(ll,(s));	\

	ll=(c)->C; HOST_l2c(ll,(s));	\

	ll=(c)->D; HOST_l2c(ll,(s));	\

	ll=(c)->A; (void)HOST_l2c(ll,(s));	\

	ll=(c)->B; (void)HOST_l2c(ll,(s));	\

	ll=(c)->C; (void)HOST_l2c(ll,(s));	\

	ll=(c)->D; (void)HOST_l2c(ll,(s));	\

	} while (0)

#define	HASH_BLOCK_DATA_ORDER	md4_block_data_order

crypto/md5/md5_locl.h

+4 −4
Original line number Diff line number Diff line
@@ -88,10 +88,10 @@ void md5_block_data_order (MD5_CTX *c, const void *p,size_t num); 
#define HASH_FINAL		MD5_Final

#define	HASH_MAKE_STRING(c,s)	do {	\

	unsigned long ll;		\

	ll=(c)->A; HOST_l2c(ll,(s));	\

	ll=(c)->B; HOST_l2c(ll,(s));	\

	ll=(c)->C; HOST_l2c(ll,(s));	\

	ll=(c)->D; HOST_l2c(ll,(s));	\

	ll=(c)->A; (void)HOST_l2c(ll,(s));	\

	ll=(c)->B; (void)HOST_l2c(ll,(s));	\

	ll=(c)->C; (void)HOST_l2c(ll,(s));	\

	ll=(c)->D; (void)HOST_l2c(ll,(s));	\

	} while (0)

#define	HASH_BLOCK_DATA_ORDER	md5_block_data_order

crypto/objects/o_names.c

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ int OBJ_NAME_new_index(unsigned long (*hash_func)(const char *), 
		name_funcs_stack=sk_NAME_FUNCS_new_null();

		MemCheck_on();

		}

	if ((name_funcs_stack == NULL))

	if (name_funcs_stack == NULL)

		{

		/* ERROR */

		return(0);

crypto/ripemd/rmd_dgst.c

+15 −15
Original line number Diff line number Diff line
@@ -104,21 +104,21 @@ void ripemd160_block_data_order (RIPEMD160_CTX *ctx, const void *p, size_t num) 


	A=ctx->A; B=ctx->B; C=ctx->C; D=ctx->D; E=ctx->E;



	HOST_c2l(data,l); X( 0)=l;	HOST_c2l(data,l); X( 1)=l;

	RIP1(A,B,C,D,E,WL00,SL00);	HOST_c2l(data,l); X( 2)=l;

	RIP1(E,A,B,C,D,WL01,SL01);	HOST_c2l(data,l); X( 3)=l;

	RIP1(D,E,A,B,C,WL02,SL02);	HOST_c2l(data,l); X( 4)=l;

	RIP1(C,D,E,A,B,WL03,SL03);	HOST_c2l(data,l); X( 5)=l;

	RIP1(B,C,D,E,A,WL04,SL04);	HOST_c2l(data,l); X( 6)=l;

	RIP1(A,B,C,D,E,WL05,SL05);	HOST_c2l(data,l); X( 7)=l;

	RIP1(E,A,B,C,D,WL06,SL06);	HOST_c2l(data,l); X( 8)=l;

	RIP1(D,E,A,B,C,WL07,SL07);	HOST_c2l(data,l); X( 9)=l;

	RIP1(C,D,E,A,B,WL08,SL08);	HOST_c2l(data,l); X(10)=l;

	RIP1(B,C,D,E,A,WL09,SL09);	HOST_c2l(data,l); X(11)=l;

	RIP1(A,B,C,D,E,WL10,SL10);	HOST_c2l(data,l); X(12)=l;

	RIP1(E,A,B,C,D,WL11,SL11);	HOST_c2l(data,l); X(13)=l;

	RIP1(D,E,A,B,C,WL12,SL12);	HOST_c2l(data,l); X(14)=l;

	RIP1(C,D,E,A,B,WL13,SL13);	HOST_c2l(data,l); X(15)=l;

	(void)HOST_c2l(data,l); X( 0)=l;(void)HOST_c2l(data,l); X( 1)=l;

	RIP1(A,B,C,D,E,WL00,SL00);	(void)HOST_c2l(data,l); X( 2)=l;

	RIP1(E,A,B,C,D,WL01,SL01);	(void)HOST_c2l(data,l); X( 3)=l;

	RIP1(D,E,A,B,C,WL02,SL02);	(void)HOST_c2l(data,l); X( 4)=l;

	RIP1(C,D,E,A,B,WL03,SL03);	(void)HOST_c2l(data,l); X( 5)=l;

	RIP1(B,C,D,E,A,WL04,SL04);	(void)HOST_c2l(data,l); X( 6)=l;

	RIP1(A,B,C,D,E,WL05,SL05);	(void)HOST_c2l(data,l); X( 7)=l;

	RIP1(E,A,B,C,D,WL06,SL06);	(void)HOST_c2l(data,l); X( 8)=l;

	RIP1(D,E,A,B,C,WL07,SL07);	(void)HOST_c2l(data,l); X( 9)=l;

	RIP1(C,D,E,A,B,WL08,SL08);	(void)HOST_c2l(data,l); X(10)=l;

	RIP1(B,C,D,E,A,WL09,SL09);	(void)HOST_c2l(data,l); X(11)=l;

	RIP1(A,B,C,D,E,WL10,SL10);	(void)HOST_c2l(data,l); X(12)=l;

	RIP1(E,A,B,C,D,WL11,SL11);	(void)HOST_c2l(data,l); X(13)=l;

	RIP1(D,E,A,B,C,WL12,SL12);	(void)HOST_c2l(data,l); X(14)=l;

	RIP1(C,D,E,A,B,WL13,SL13);	(void)HOST_c2l(data,l); X(15)=l;

	RIP1(B,C,D,E,A,WL14,SL14);

	RIP1(A,B,C,D,E,WL15,SL15);