diff options
| author | Niels Möller <nisse@lysator.liu.se> | 2010-09-20 11:11:56 +0200 |
|---|---|---|
| committer | Niels Möller <nisse@lysator.liu.se> | 2010-09-20 11:11:56 +0200 |
| commit | 6a9060e4b5f17cbfdbe35fc3294d56c6831e8427 (patch) | |
| tree | 8d30cd963d8ffba3e9d970dd6bb81b3720785ca2 /camellia-crypt-internal.c | |
| parent | 5e826a6394cf1d756d00b1ce45e1f1ce5fd5cab5 (diff) | |
| download | nettle-6a9060e4b5f17cbfdbe35fc3294d56c6831e8427.tar.gz | |
(CAMELLIA_ROUNDSM): Moved addition of key to the end, to use a 64-bit
xor.
Rev: nettle/camellia-crypt-internal.c:1.3
Diffstat (limited to 'camellia-crypt-internal.c')
| -rw-r--r-- | camellia-crypt-internal.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/camellia-crypt-internal.c b/camellia-crypt-internal.c index c38c225f..679c4db1 100644 --- a/camellia-crypt-internal.c +++ b/camellia-crypt-internal.c @@ -76,8 +76,6 @@ ^ T->sp3033[((x) >> 40) & 0xff] \ ^ T->sp4404[((x) >> 32) & 0xff]; \ /* il == (t1^t3^t4),(t1^t2^t4),(t1^t2^t3),(t2^t3^t4) */ \ - __il ^= (k) >> 32; \ - __ir ^= (k) & 0xffffffff; \ __ir ^= __il; \ /* ir == (t1^t3^t4^t6^t7^t8),(t1^t2^t4^t5^t7^t8), \ (t1^t2^t3^t5^t6^t8),(t2^t3^t4^t5^t6^t7) \ @@ -88,6 +86,7 @@ /* il == (t1^t2^t6^t7^t8),(t2^t3^t5^t7^t8), \ (t3^t4^t5^t6^t8),(t1^t4^t5^t6^t7) \ == y5,y6,y7,y8 */ \ + y ^= (k); \ y ^= ((uint64_t) __ir << 32) | __il; \ } while (0) |