X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/6ced98bd0eb9435f22e745b723e6ebb96e543032..298182ad446aaced14dea7ed0e7c968946787288:/hmac.h

diff --git a/hmac.h b/hmac.h
index 7ad01f7..e874200 100644
--- a/hmac.h
+++ b/hmac.h
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: hmac.h,v 1.3 2000/06/17 11:23:57 mdw Exp $
+ * $Id: hmac.h,v 1.7 2004/04/08 01:36:15 mdw Exp $
  *
  * Generic code for HMAC and NMAC
  *
@@ -27,20 +27,6 @@
  * MA 02111-1307, USA.
  */
 
-/*----- Revision history --------------------------------------------------* 
- *
- * $Log: hmac.h,v $
- * Revision 1.3  2000/06/17 11:23:57  mdw
- * New key size interface.
- *
- * Revision 1.2  1999/12/10 23:17:39  mdw
- * Split mode macros into interface and implementation.
- *
- * Revision 1.1  1999/09/03 08:41:12  mdw
- * Initial import.
- *
- */
-
 /*----- Notes on the HMAC and NMAC constructions --------------------------*
  *
  * Designed by Mihir Bellare, Ran Canetti and Hugo Krawczyk, NMAC is a method
@@ -84,9 +70,9 @@
 /* --- An HMAC or NMAC key --- */					\
 									\
 typedef struct pre##_mackey {						\
-  octet ochain[PRE##_HASHSZ];		/* Chaining for outer hash */	\
+  octet ochain[PRE##_STATESZ];		/* Chaining for outer hash */	\
   unsigned ocount;			/* Byte count for outer hash */	\
-  octet ichain[PRE##_HASHSZ];		/* Chaining for inner hash */	\
+  octet ichain[PRE##_STATESZ];		/* Chaining for inner hash */	\
   unsigned icount;			/* Byte count for inner hash */	\
 } pre##_mackey;								\
 									\
@@ -94,13 +80,15 @@ typedef struct pre##_mackey {						\
 									\
 typedef struct pre##_macctx {						\
   pre##_ctx ctx;			/* Context for main hashing */	\
-  octet chain[PRE##_HASHSZ];		/* Chaining for outer hash */	\
+  octet chain[PRE##_STATESZ];		/* Chaining for outer hash */	\
   unsigned count;			/* Byte count for outer hash */	\
 } pre##_macctx;								\
 									\
 /* --- Other useful constants --- */					\
 									\
-extern const octet pre##_mackeysz[];					\
+extern const octet pre##_hmackeysz[];					\
+extern const octet pre##_nmackeysz[];					\
+extern const octet pre##_sslmackeysz[];					\
 									\
 /* --- @pre_nmacinit@ --- *						\
  *									\
@@ -134,6 +122,21 @@ extern void pre##_nmacinit(pre##_mackey */*key*/,			\
 extern void pre##_hmacinit(pre##_mackey */*key*/, 			\
 			   const void */*k*/, size_t /*sz*/);		\
 									\
+/* --- @pre_sslmacinit@ --- *						\
+ *									\
+ * Arguments:	@pre_mackey *key@ = pointer to MAC key object		\
+ *		@const void *k@ = pointer to key to use			\
+ *		@size_t sz@ = size of key data				\
+ *									\
+ * Returns:	---							\
+ *									\
+ * Use:		Initializes a MAC key for doing hasing using the SSL3	\
+ *		variant of HMAC.					\
+ */									\
+									\
+extern void pre##_sslmacinit(pre##_mackey */*key*/,			\
+			     const void */*k*/, size_t /*sz*/);		\
+									\
 /* --- @pre_macinit@ --- *						\
  *									\
  * Arguments:	@pre_macctx *ctx@ = pointer to MAC context block	\
@@ -175,7 +178,9 @@ extern void pre##_macdone(pre##_macctx */*ctx*/, void */*mac*/);	\
 									\
 /* --- Generic MAC interface --- */					\
 									\
-extern const gcmac pre##_hmac;
+extern const gcmac pre##_hmac;						\
+extern const gcmac pre##_nmac;						\
+extern const gcmac pre##_sslmac;
 
 /*----- That's all, folks -------------------------------------------------*/