Revert "Merge branch 'upstream' into tizen"

[platform/upstream/nettle.git] / camellia-crypt-internal.c

diff --git a/camellia-crypt-internal.c b/camellia-crypt-internal.c
index 8a9296e..21c5240 100644 (file)
--- a/camellia-crypt-internal.c
+++ b/camellia-crypt-internal.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2006,2007
  * NTT (Nippon Telegraph and Telephone Corporation).
  *
- * Copyright (C) 2010 Niels Möller
+ * Copyright (C) 2010 Niels Möller
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -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),                        \