* (c) 2001 Straylight/Edgeware
*/
-/*----- Licensing notice --------------------------------------------------*
+/*----- Licensing notice --------------------------------------------------*
*
* This file is part of Catacomb.
*
* 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,
p = buf;
for (i = 0; i < nk; i++) {
- k->w[i] = LOAD32_L(p);
+ k->w[i] = LOAD32_B(p);
p += 4;
}
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