X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/4b8968ddae4a750b87d9f1a64a9833ee530bd398..80be023065ced106a4078a36371c135a60d2bd6c:/rc4.c

diff --git a/rc4.c b/rc4.c
index 69adcc6..ac011b1 100644
--- a/rc4.c
+++ b/rc4.c
@@ -1,6 +1,6 @@
 /* -*-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
  *
@@ -27,24 +27,6 @@
  * 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>
@@ -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: {