Commit 8c9336ce authored by Felix Laurie von Massenbach's avatar Felix Laurie von Massenbach Committed by Ben Laurie
Browse files

Tidy up speed.c a little.

parent b5419b81

apps/speed.c

+18 −17
Original line number Original line Diff line number Diff line
@@ -1307,25 +1307,26 @@ int MAIN(int argc, char **argv) 
	c[D_IGE_256_AES][0]=count;

	c[D_IGE_256_AES][0]=count;

	c[D_GHASH][0]=count;

	c[D_GHASH][0]=count;





	for (i=1; i<SIZE_NUM; i++)

		{

		c[D_MD2][i]=c[D_MD2][0]*4*lengths[0]/lengths[i];

		c[D_MDC2][i]=c[D_MDC2][0]*4*lengths[0]/lengths[i];

		c[D_MD4][i]=c[D_MD4][0]*4*lengths[0]/lengths[i];

		c[D_MD5][i]=c[D_MD5][0]*4*lengths[0]/lengths[i];

		c[D_HMAC][i]=c[D_HMAC][0]*4*lengths[0]/lengths[i];

		c[D_SHA1][i]=c[D_SHA1][0]*4*lengths[0]/lengths[i];

		c[D_RMD160][i]=c[D_RMD160][0]*4*lengths[0]/lengths[i];

		c[D_SHA256][i]=c[D_SHA256][0]*4*lengths[0]/lengths[i];

		c[D_SHA512][i]=c[D_SHA512][0]*4*lengths[0]/lengths[i];

		c[D_WHIRLPOOL][i]=c[D_WHIRLPOOL][0]*4*lengths[0]/lengths[i];

		}

	for (i=1; i<SIZE_NUM; i++)

	for (i=1; i<SIZE_NUM; i++)

		{

		{

		long l0,l1;

		long l0,l1;





		l0=(long)lengths[i-1];

		l0=(long)lengths[0];

		l1=(long)lengths[i];

		l1=(long)lengths[i];

		

		c[D_MD2][i]=c[D_MD2][0]*4*l0/l1;

		c[D_MDC2][i]=c[D_MDC2][0]*4*l0/l1;

		c[D_MD4][i]=c[D_MD4][0]*4*l0/l1;

		c[D_MD5][i]=c[D_MD5][0]*4*l0/l1;

		c[D_HMAC][i]=c[D_HMAC][0]*4*l0/l1;

		c[D_SHA1][i]=c[D_SHA1][0]*4*l0/l1;

		c[D_RMD160][i]=c[D_RMD160][0]*4*l0/l1;

		c[D_SHA256][i]=c[D_SHA256][0]*4*l0/l1;

		c[D_SHA512][i]=c[D_SHA512][0]*4*l0/l1;

		c[D_WHIRLPOOL][i]=c[D_WHIRLPOOL][0]*4*l0/l1;



		l0=(long)lengths[i-1];

		

		c[D_RC4][i]=c[D_RC4][i-1]*l0/l1;

		c[D_RC4][i]=c[D_RC4][i-1]*l0/l1;

		c[D_CBC_DES][i]=c[D_CBC_DES][i-1]*l0/l1;

		c[D_CBC_DES][i]=c[D_CBC_DES][i-1]*l0/l1;

		c[D_EDE3_DES][i]=c[D_EDE3_DES][i-1]*l0/l1;

		c[D_EDE3_DES][i]=c[D_EDE3_DES][i-1]*l0/l1;