Changeset e2869bf

Timestamp:

2007-10-07T22:07:25Z (17 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

2896674

Parents:

2305488

Message:

"Changed" the ArcFour implementation. I'm afraid this was a waste of time,
but at least I added a neat unittest...

Files:

• lib/arc.c (modified) (2 diffs)
• tests/check_arc.c (modified) (1 diff)

lib/arc.c

@@ -61 +61 @@
         struct arc_state *st;
         int i, j, tmp;
+        unsigned char S2[256];
         
         st = g_malloc( sizeof( struct arc_state ) );
         st->i = st->j = 0;
-        for( i = 0; i < 256; i ++ )
-                st->S[i] = i;
-        
         if( kl <= 0 )
                 kl = strlen( (char*) key );
         
+        for( i = 0; i < 256; i ++ )
+        {
+                st->S[i] = i;
+                S2[i] = key[i%kl];
+        }
+        
         for( i = j = 0; i < 256; i ++ )
         {
-                j = ( j + st->S[i] + key[i%kl] ) & 0xff;
+                j = ( j + st->S[i] + S2[i] ) & 0xff;
                 tmp = st->S[i];
                 st->S[i] = st->S[j];
                 st->S[j] = tmp;
         }
+        
+        memset( S2, 0, 256 );
+        i = j = 0;
         
         for( i = 0; i < cycles; i ++ )
@@ -104 +111 @@
         st->S[st->i] = st->S[st->j];
         st->S[st->j] = tmp;
-        
-        return st->S[(st->S[st->i] + st->S[st->j]) & 0xff];
+        tmp = (st->S[st->i] + st->S[st->j]) & 0xff;
+        
+        return st->S[tmp];
 }
 

tests/check_arc.c

@@ -41 +41 @@
 struct
 {
-        const unsigned char crypted[24];
+        unsigned char crypted[24];
         int len;
         char *decrypted;