diff noekeon.c @ 143:5d99163f7e32 libtomcrypt-orig

import of libtomcrypt 0.99
author Matt Johnston <matt@ucc.asn.au>
date Sun, 19 Dec 2004 11:34:45 +0000
parents 7faae8f46238
children
line wrap: on
line diff
--- a/noekeon.c	Tue Jun 15 14:07:21 2004 +0000
+++ b/noekeon.c	Sun Dec 19 11:34:45 2004 +0000
@@ -33,7 +33,6 @@
    0x000000d4UL 
 };
 
-
 #define kTHETA(a, b, c, d)                                 \
     temp = a^c; temp = temp ^ ROL(temp, 8) ^ ROR(temp, 8); \
     b ^= temp; d ^= temp;                                  \
@@ -97,9 +96,7 @@
 #endif
 {
    ulong32 a,b,c,d,temp;
-#ifdef SMALL_CODE
    int r;
-#endif
 
    _ARGCHK(key != NULL);
    _ARGCHK(pt != NULL);
@@ -115,16 +112,9 @@
        GAMMA(a,b,c,d); \
        PI2(a,b,c,d);
 
-#ifdef SMALL_CODE
    for (r = 0; r < 16; ++r) {
        ROUND(r);
    }
-#else 
-   ROUND( 0); ROUND( 1); ROUND( 2); ROUND( 3);
-   ROUND( 4); ROUND( 5); ROUND( 6); ROUND( 7);
-   ROUND( 8); ROUND( 9); ROUND(10); ROUND(11);
-   ROUND(12); ROUND(13); ROUND(14); ROUND(15);
-#endif
 
 #undef ROUND
 
@@ -150,9 +140,7 @@
 #endif
 {
    ulong32 a,b,c,d, temp;
-#ifdef SMALL_CODE
    int r;
-#endif
 
    _ARGCHK(key != NULL);
    _ARGCHK(pt != NULL);
@@ -169,17 +157,10 @@
        GAMMA(a,b,c,d); \
        PI2(a,b,c,d); 
 
-#ifdef SMALL_CODE
    for (r = 16; r > 0; --r) {
        ROUND(r);
    }
-#else
-   ROUND(16); ROUND(15); ROUND(14); ROUND(13);
-   ROUND(12); ROUND(11); ROUND(10); ROUND( 9);
-   ROUND( 8); ROUND( 7); ROUND( 6); ROUND( 5);
-   ROUND( 4); ROUND( 3); ROUND( 2); ROUND( 1);
-#endif
-   
+
 #undef ROUND
 
    THETA(key->noekeon.dK, a,b,c,d);