From: mdw <mdw>
Date: Sat, 17 Jun 2000 11:55:13 +0000 (+0000)
Subject: New key size interface.  Allow key material to be combined with an
X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/commitdiff_plain/030a2456a4fb1a14fdb2e89436ea44fb649822de

New key size interface.  Allow key material to be combined with an
existing initialized context.
---

diff --git a/rc4.h b/rc4.h
index b1acc23..856846e 100644
--- a/rc4.h
+++ b/rc4.h
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: rc4.h,v 1.2 1999/12/10 23:27:46 mdw Exp $
+ * $Id: rc4.h,v 1.3 2000/06/17 11:55:13 mdw Exp $
  *
  * The alleged RC4 stream cipher
  *
@@ -30,6 +30,10 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: rc4.h,v $
+ * Revision 1.3  2000/06/17 11:55:13  mdw
+ * New key size interface.  Allow key material to be combined with an
+ * existing initialized context.
+ *
  * Revision 1.2  1999/12/10 23:27:46  mdw
  * Generic cipher and RNG interfaces.
  *
@@ -128,6 +132,21 @@ typedef struct rc4_ctx {
 
 /*----- Functions provided ------------------------------------------------*/
 
+/* --- @rc4_addkey@ --- *
+ *
+ * Arguments:	@rc4_ctx *ctx@ = pointer to context to key
+ *		@const void *k@ = pointer to key data to use
+ *		@size_t sz@ = size of the key data
+ *
+ * Returns:	---
+ *
+ * Use:		Mixes key data with an RC4 context.  The RC4 context is not
+ *		reset before mixing.  This may be used to mix new key
+ *		material with an existing RC4 context.
+ */
+
+extern void rc4_addkey(rc4_ctx */*ctx*/, const void */*k*/, size_t /*sz*/);
+
 /* --- @rc4_init@ --- *
  *
  * Arguments:	@rc4_ctx *ctx@ = pointer to context to initialize
@@ -164,6 +183,9 @@ extern void rc4_encrypt(rc4_ctx */*ctx*/,
 
 /*----- Generic cipher interface ------------------------------------------*/
 
+#define RC4_KEYSZ 16
+extern const octet rc4_keysz[];
+
 extern const gccipher rc4;
 
 /*----- Generic random number generator interface -------------------------*/