Mercurial > dropbear
diff des.c @ 143:5d99163f7e32 libtomcrypt-orig
import of libtomcrypt 0.99
| author | Matt Johnston <matt@ucc.asn.au> |
|---|---|
| date | Sun, 19 Dec 2004 11:34:45 +0000 |
| parents | 7faae8f46238 |
| children | 8fc624ea2521 |
line wrap: on
line diff
--- a/des.c Tue Jun 15 14:07:21 2004 +0000 +++ b/des.c Sun Dec 19 11:34:45 2004 +0000 @@ -1377,7 +1377,7 @@ *cook++ |= (*raw1 & 0x0000003fL); } - memcpy(keyout, dough, sizeof dough); + XMEMCPY(keyout, dough, sizeof dough); } #ifdef CLEAN_STACK @@ -1395,7 +1395,7 @@ #endif { ulong32 work, right, leftt; - int round; + int cur_round; leftt = block[0]; right = block[1]; @@ -1439,7 +1439,7 @@ } #endif - for (round = 0; round < 8; round++) { + for (cur_round = 0; cur_round < 8; cur_round++) { work = ROR(right, 4) ^ *keys++; leftt ^= SP7[work & 0x3fL] ^ SP5[(work >> 8) & 0x3fL] @@ -1534,7 +1534,7 @@ _ARGCHK(key != NULL); _ARGCHK(skey != NULL); - if( num_rounds != 0 && num_rounds != 16) { + if(num_rounds != 0 && num_rounds != 16) { return CRYPT_INVALID_ROUNDS; }