diff options
| author | Niels Möller <nisse@lysator.liu.se> | 2012-03-31 21:32:01 +0200 |
|---|---|---|
| committer | Niels Möller <nisse@lysator.liu.se> | 2012-03-31 21:32:01 +0200 |
| commit | 94de4dd997cd68e1df84131582d3c5f2a8632966 (patch) | |
| tree | c5ec5dcc3d9fab344da1ba70da78d9b0dc131823 /camellia-crypt-internal.c | |
| parent | 67cd46aad27bdfee385048d1e256e8a5a03ad22d (diff) | |
| download | nettle-94de4dd997cd68e1df84131582d3c5f2a8632966.tar.gz | |
Use ROTL32 in the camellia code.
Diffstat (limited to 'camellia-crypt-internal.c')
| -rw-r--r-- | camellia-crypt-internal.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/camellia-crypt-internal.c b/camellia-crypt-internal.c index 70051589..21c52400 100644 --- a/camellia-crypt-internal.c +++ b/camellia-crypt-internal.c @@ -46,7 +46,7 @@ __kl = (k) >> 32; \ __kr = (k) & 0xffffffff; \ __t = __xl & __kl; \ - __xr ^= ROL32(1, __t); \ + __xr ^= ROTL32(1, __t); \ __xl ^= (__xr | __kr); \ (x) = ((uint64_t) __xl << 32) | __xr; \ } while (0) @@ -59,7 +59,7 @@ __kr = (k) & 0xffffffff; \ __xl ^= (__xr | __kr); \ __t = __xl & __kl; \ - __xr ^= ROL32(1, __t); \ + __xr ^= ROTL32(1, __t); \ (x) = ((uint64_t) __xl << 32) | __xr; \ } while (0) @@ -82,7 +82,7 @@ /* 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) \ == y1,y2,y3,y4 */ \ - __il = ROL32(24, __il); \ + __il = ROTL32(24, __il); \ /* il == (t2^t3^t4),(t1^t3^t4),(t1^t2^t4),(t1^t2^t3) */ \ __il ^= __ir; \ /* il == (t1^t2^t6^t7^t8),(t2^t3^t5^t7^t8), \ @@ -112,7 +112,7 @@ /* 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) \ == y1,y2,y3,y4 */ \ - __il = ROL32(24, __il); \ + __il = ROTL32(24, __il); \ /* il == (t2^t3^t4),(t1^t3^t4),(t1^t2^t4),(t1^t2^t3) */ \ __il ^= __ir; \ /* il == (t1^t2^t6^t7^t8),(t2^t3^t5^t7^t8), \ |