summaryrefslogtreecommitdiff
path: root/camellia-internal.h
diff options
context:
space:
mode:
authorNiels Möller <nisse@lysator.liu.se>2012-03-31 21:32:01 +0200
committerNiels Möller <nisse@lysator.liu.se>2012-03-31 21:32:01 +0200
commit94de4dd997cd68e1df84131582d3c5f2a8632966 (patch)
treec5ec5dcc3d9fab344da1ba70da78d9b0dc131823 /camellia-internal.h
parent67cd46aad27bdfee385048d1e256e8a5a03ad22d (diff)
downloadnettle-94de4dd997cd68e1df84131582d3c5f2a8632966.tar.gz
Use ROTL32 in the camellia code.
Diffstat (limited to 'camellia-internal.h')
-rw-r--r--camellia-internal.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/camellia-internal.h b/camellia-internal.h
index e0cfdf56..c0f67c8a 100644
--- a/camellia-internal.h
+++ b/camellia-internal.h
@@ -45,11 +45,8 @@
* macros
*/
-/* Rotation of 32-bit values. */
-#define ROL32(bits, x) (((x) << (bits)) | ((x) >> (32 - (bits))))
-
/* Destructive rotation of 128 bit values. */
-#define ROL128(bits, xl, xr) do { \
+#define ROTL128(bits, xl, xr) do { \
uint64_t __rol128_t = (xl); \
(xl) = ((xl) << (bits)) | ((xr) >> (64 - (bits))); \
(xr) = ((xr) << (bits)) | (__rol128_t >> (64 - (bits))); \