Commit 9f03d0fc authored by Andy Polyakov's avatar Andy Polyakov
Browse files

Optimize #undef DES_UNROLL for size.

parent 2140659b

crypto/des/des_enc.c

+4 −12
Original line number Diff line number Diff line
@@ -108,12 +108,10 @@ void DES_encrypt1(DES_LONG *data, DES_key_schedule *ks, int enc) 
		D_ENCRYPT(l,r,28); /*  15 */

		D_ENCRYPT(r,l,30); /*  16 */

#else

		for (i=0; i<32; i+=8)

		for (i=0; i<32; i+=4)

			{

			D_ENCRYPT(l,r,i+0); /*  1 */

			D_ENCRYPT(r,l,i+2); /*  2 */

			D_ENCRYPT(l,r,i+4); /*  3 */

			D_ENCRYPT(r,l,i+6); /*  4 */

			}

#endif

		}
@@ -137,12 +135,10 @@ void DES_encrypt1(DES_LONG *data, DES_key_schedule *ks, int enc) 
		D_ENCRYPT(l,r, 2); /*  2 */

		D_ENCRYPT(r,l, 0); /*  1 */

#else

		for (i=30; i>0; i-=8)

		for (i=30; i>0; i-=4)

			{

			D_ENCRYPT(l,r,i-0); /* 16 */

			D_ENCRYPT(r,l,i-2); /* 15 */

			D_ENCRYPT(l,r,i-4); /* 14 */

			D_ENCRYPT(r,l,i-6); /* 13 */

			}

#endif

		}
@@ -204,12 +200,10 @@ void DES_encrypt2(DES_LONG *data, DES_key_schedule *ks, int enc) 
		D_ENCRYPT(l,r,28); /*  15 */

		D_ENCRYPT(r,l,30); /*  16 */

#else

		for (i=0; i<32; i+=8)

		for (i=0; i<32; i+=4)

			{

			D_ENCRYPT(l,r,i+0); /*  1 */

			D_ENCRYPT(r,l,i+2); /*  2 */

			D_ENCRYPT(l,r,i+4); /*  3 */

			D_ENCRYPT(r,l,i+6); /*  4 */

			}

#endif

		}
@@ -233,12 +227,10 @@ void DES_encrypt2(DES_LONG *data, DES_key_schedule *ks, int enc) 
		D_ENCRYPT(l,r, 2); /*  2 */

		D_ENCRYPT(r,l, 0); /*  1 */

#else

		for (i=30; i>0; i-=8)

		for (i=30; i>0; i-=4)

			{

			D_ENCRYPT(l,r,i-0); /* 16 */

			D_ENCRYPT(r,l,i-2); /* 15 */

			D_ENCRYPT(l,r,i-4); /* 14 */

			D_ENCRYPT(r,l,i-6); /* 13 */

			}

#endif

		}

crypto/des/ecb_enc.c

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ const char *DES_options(void) 
#ifdef DES_UNROLL

		unroll="16";

#else

		unroll="4";

		unroll="2";

#endif

		if (sizeof(DES_LONG) != sizeof(long))

			size="int";

crypto/des/fcrypt_b.c

+1 −3
Original line number Diff line number Diff line
@@ -100,12 +100,10 @@ void fcrypt_body(DES_LONG *out, DES_key_schedule *ks, DES_LONG Eswap0, 
#ifndef DES_UNROLL

		register int i;



		for (i=0; i<32; i+=8)

		for (i=0; i<32; i+=4)

			{

			D_ENCRYPT(l,r,i+0); /*  1 */

			D_ENCRYPT(r,l,i+2); /*  2 */

			D_ENCRYPT(l,r,i+4); /*  1 */

			D_ENCRYPT(r,l,i+6); /*  2 */

			}

#else

		D_ENCRYPT(l,r, 0); /*  1 */