/* -*-c-*-
*
- * $Id: noekeon.c,v 1.1 2001/05/08 22:17:41 mdw Exp $
+ * $Id: noekeon.c,v 1.3 2004/04/08 01:36:15 mdw Exp $
*
* The Noekeon block cipher
*
* (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,
* MA 02111-1307, USA.
*/
-/*----- Revision history --------------------------------------------------*
- *
- * $Log: noekeon.c,v $
- * Revision 1.1 2001/05/08 22:17:41 mdw
- * New cipher Noekeon added.
- *
- */
-
/*----- Header files ------------------------------------------------------*/
#include <assert.h>
/* --- To generate the magic --- *
*
- * perl -e'@r=();$x=0x80;for(0..16){push(@r,$x);$x<<=1;$x^=0x11b if$x&0x100;}
- * i;print join(", ",map{sprintf"0x%02x",$_}@r),"\n";'
+ * perl -e'@@r=();$x=0x80;for(0..16){push(@@r,$x);$x<<=1;$x^=0x11b
+ * if$x&0x100;};print join(", ",map{sprintf"0x%02x",$_}@@r),"\n";'
*/
static const octet rcon[17] = {
static const noekeon_ctx nullkey = { { 0, 0, 0, 0 } };
KSZ_ASSERT(noekeon, sz);
- k->k[0] = LOAD32(p + 0);
- k->k[1] = LOAD32(p + 4);
- k->k[2] = LOAD32(p + 8);
+ k->k[0] = LOAD32(p + 0);
+ k->k[1] = LOAD32(p + 4);
+ k->k[2] = LOAD32(p + 8);
k->k[3] = LOAD32(p + 12);
noekeon_eblk(&nullkey, k->k, k->k);
}
a ^= ka; b ^= kb; c ^= kc; d ^= kd; \
_x = b ^ d; _x ^= ROR32(_x, 8) ^ ROL32(_x, 8); a ^= _x; c ^= _x; \
} while (0)
-
+
#define ITHETA(ka, kb, kc, kd, a, b, c, d) do { \
uint32 _x; \
_x = b ^ d; _x ^= ROR32(_x, 8) ^ ROL32(_x, 8); a ^= _x; c ^= _x; \