diff options
| author | Andy Polyakov <appro@openssl.org> | 2008-12-22 14:10:42 +0000 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2008-12-22 14:10:42 +0000 |
| commit | 9f03d0fc04805d22922be8a89a11a32054aa7e1d (patch) | |
| tree | 1b60a7fcd17081844ed1d7d64412469354cf7897 /crypto | |
| parent | 2140659b00af2e6e392c859cfc392c68d0fe0a10 (diff) | |
Optimize #undef DES_UNROLL for size.
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/des/des_enc.c | 16 | ||||
| -rw-r--r-- | crypto/des/ecb_enc.c | 2 | ||||
| -rw-r--r-- | crypto/des/fcrypt_b.c | 4 |
3 files changed, 6 insertions, 16 deletions
diff --git a/crypto/des/des_enc.c b/crypto/des/des_enc.c index ab0b438083..828feba208 100644 --- a/crypto/des/des_enc.c +++ b/crypto/des/des_enc.c @@ -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 } diff --git a/crypto/des/ecb_enc.c b/crypto/des/ecb_enc.c index 0861988323..0684e769b3 100644 --- a/crypto/des/ecb_enc.c +++ b/crypto/des/ecb_enc.c @@ -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"; diff --git a/crypto/des/fcrypt_b.c b/crypto/des/fcrypt_b.c index 1390138787..8822816938 100644 --- a/crypto/des/fcrypt_b.c +++ b/crypto/des/fcrypt_b.c @@ -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 */ |