Hash utilities: maintain a hash state object, not a bundle of arguments.

[u/mdw/catacomb] / rc4.c

diff --git a/rc4.c b/rc4.c
index 69adcc6..83b5104 100644 (file)
--- a/rc4.c
+++ b/rc4.c
@@ -1,13 +1,13 @@
 /* -*-c-*-
  *
- * $Id: rc4.c,v 1.4 2000/06/17 11:55:22 mdw Exp $
+ * $Id: rc4.c,v 1.6 2004/04/08 01:36:15 mdw Exp $
  *
  * The alleged RC4 stream cipher
  *
  * (c) 1999 Straylight/Edgeware
  */
 
-/*----- Licensing notice --------------------------------------------------* 
+/*----- Licensing notice --------------------------------------------------*
  *
  * This file is part of Catacomb.
  *
@@ -15,36 +15,18 @@
  * 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: rc4.c,v $
- * Revision 1.4  2000/06/17 11:55:22  mdw
- * New key size interface.  Allow key material to be combined with an
- * existing initialized context.  Use secure arena for memory allocation.
- *
- * Revision 1.3  1999/12/13 15:34:01  mdw
- * Add support for seeding from a generic pseudorandom source.
- *
- * Revision 1.2  1999/12/10 23:27:35  mdw
- * Generic cipher and RNG interfaces.
- *
- * Revision 1.1  1999/09/03 08:41:12  mdw
- * Initial import.
- *
- */
-
 /*----- Header files ------------------------------------------------------*/
 
 #include <assert.h>
@@ -93,7 +75,7 @@ void rc4_addkey(rc4_ctx *ctx, const void *k, size_t sz)
     ctx->s[j] = si;
     if (p == q)
       p = k;
-  }  
+  }
 
   ctx->i = ctx->j = 0;
 }
@@ -209,6 +191,7 @@ static int grmisc(grand *r, unsigned op, ...)
   grctx *g = (grctx *)r;
   va_list ap;
   int rc = 0;
+  uint32 i;
   octet buf[4];
   va_start(ap, op);
 
@@ -228,11 +211,13 @@ static int grmisc(grand *r, unsigned op, ...)
       }
       break;
     case GRAND_SEEDINT:
-      STORE32(buf, va_arg(ap, unsigned));
+      i = va_arg(ap, unsigned);
+      STORE32(buf, i);
       rc4_addkey(&g->rc4, buf, sizeof(buf));
       break;
     case GRAND_SEEDUINT32:
-      STORE32(buf, va_arg(ap, uint32));
+      i = va_arg(ap, uint32);
+      STORE32(buf, i);
       rc4_addkey(&g->rc4, buf, sizeof(buf));
       break;
     case GRAND_SEEDBLOCK: {
@@ -330,7 +315,7 @@ static int v_encrypt(dstr *v)
   if (memcmp(v[2].buf, d.buf, d.len) != 0) {
     ok = 0;
     printf("\nfail encryption:"
-          "\n\tkey        = ");
+          "\n\tkey        = ");
     type_hex.dump(&v[0], stdout);
     printf("\n\tplaintext  = "); type_hex.dump(&v[1], stdout);
     printf("\n\texpected   = "); type_hex.dump(&v[2], stdout);
@@ -356,7 +341,7 @@ static int v_generate(dstr *v)
   if (memcmp(v[2].buf, d.buf, d.len) != 0) {
     ok = 0;
     printf("\nfail generation:"
-          "\n\tkey        = ");
+          "\n\tkey        = ");
     type_hex.dump(&v[0], stdout);
     printf("\n\tskip len   = %i", *(int *)v[1].buf);
     printf("\n\texpected   = "); type_hex.dump(&v[2], stdout);