X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/b817bfc642225b8c3c0b6a7e42d1fb949b61a606..813390c45f438f411662b1a55678e63f11681eb4:/rijndael-base.c

diff --git a/rijndael-base.c b/rijndael-base.c
index b2480c8..5230cbc 100644
--- a/rijndael-base.c
+++ b/rijndael-base.c
@@ -7,7 +7,7 @@
  * (c) 2001 Straylight/Edgeware
  */
 
-/*----- Licensing notice --------------------------------------------------* 
+/*----- Licensing notice --------------------------------------------------*
  *
  * This file is part of Catacomb.
  *
@@ -15,12 +15,12 @@
  * it under the terms of the GNU Library General Public License as
  * published by the Free Software Foundation; either version 2 of the
  * License, or (at your option) any later version.
- * 
+ *
  * Catacomb is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Library General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Library General Public
  * License along with Catacomb; if not, write to the Free
  * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
@@ -90,7 +90,7 @@ void rijndael_setup(rijndael_ctx *k, unsigned nb, const void *buf, size_t sz)
 
   p = buf;
   for (i = 0; i < nk; i++) {
-    k->w[i] = LOAD32_L(p);
+    k->w[i] = LOAD32_B(p);
     p += 4;
   }
 
@@ -102,8 +102,8 @@ void rijndael_setup(rijndael_ctx *k, unsigned nb, const void *buf, size_t sz)
   for (; i < nw; i++) {
     uint32 w = k->w[i - nk];
     if (i % nk == 0) {
-      ww = ROR32(ww, 8);
-      w ^= SUB(S, ww, ww, ww, ww) ^ *p++;
+      ww = ROL32(ww, 8);
+      w ^= SUB(S, ww, ww, ww, ww) ^ (*p++ << 24);
     } else if (nk > 6 && i % nk == 4)
       w ^= SUB(S, ww, ww, ww, ww);
     else