Fix arcfour module.

diff --git a/ChangeLog b/ChangeLog
index 312289caa05e4152f242f42b27c75a1263f7ef0e..095539f40b65dfef7fe965a25e84a076a230fe4c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-10-22  Simon Josefsson  <jas@extundo.com>
+
+       * modules/arcfour (Depends-on): Need stdint.
+
 2005-10-21  Bruno Haible  <bruno@clisp.org>
 
        * gnulib-tool (func_import, func_create_testdir): Add quoting to last

diff --git a/lib/ChangeLog b/lib/ChangeLog
index a35c4c557d6abfd3a88c17a9ec7222cfdb799a40..60f30a6a72358f5cb725ab75dd5a59bbbb68838a 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,9 @@
+2005-10-22  Simon Josefsson  <jas@extundo.com>
+
+       * arcfour.h, arcfour.c: Use fixed size indices in the
+       arcfour_context struct (simplify test vector testing in GNU
+       Shishi).
+
 2005-10-22  Simon Josefsson  <jas@extundo.com>
 
        * md4.c, md4.c: Simplify buffer handling visavi alignment,

diff --git a/lib/arcfour.c b/lib/arcfour.c
index 61b851127c9d6aa7382d338c4edf8cfabb163762..97b61160e18b38434ae6d0f7f938284064b60c1f 100644 (file)
--- a/lib/arcfour.c
+++ b/lib/arcfour.c
@@ -36,16 +36,16 @@ void
 arcfour_stream (arcfour_context * context, const char *inbuf, char *outbuf,
                size_t length)
 {
-  size_t i = context->idx_i;
-  size_t j = context->idx_j;
+  uint8_t i = context->idx_i;
+  uint8_t j = context->idx_j;
   char *sbox = context->sbox;
 
   for (; length > 0; length--)
     {
       char t;
 
-      i = (i + 1) % ARCFOUR_SBOX_SIZE;
-      j = (j + sbox[i]) % ARCFOUR_SBOX_SIZE;
+      i++;
+      j += sbox[i];
       t = sbox[i];
       sbox[i] = sbox[j];
       sbox[j] = t;

diff --git a/lib/arcfour.h b/lib/arcfour.h
index 28ef679d05531b51219cfa0eb6061ef7cc2db3a1..0a9d75c0f745fd9c18a84abd3cf4654f326c1084 100644 (file)
--- a/lib/arcfour.h
+++ b/lib/arcfour.h
@@ -25,13 +25,14 @@
 # define ARCFOUR_H
 
 # include <stddef.h>
+# include <stdint.h>
 
 #define ARCFOUR_SBOX_SIZE 256
 
 typedef struct
 {
-  size_t idx_i, idx_j;
   char sbox[ARCFOUR_SBOX_SIZE];
+  uint8_t idx_i, idx_j;
 } arcfour_context;
 
 /* Apply ARCFOUR stream to INBUF placing the result in OUTBUF, both of

diff --git a/modules/arcfour b/modules/arcfour
index 328fcbd287e50c3750d35bc9baea5f3eb95fb810..a37ec0b7f7f9558bc50fc3bfb37c973462e26205 100644 (file)
--- a/modules/arcfour
+++ b/modules/arcfour
@@ -7,6 +7,7 @@ lib/arcfour.c
 m4/arcfour.m4
 
 Depends-on:
+stdint
 
 configure.ac:
 gl_ARCFOUR