X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/79ba130cb5776f994f6a3f0f87159d8cbc5ff129..0d4a06cd790bcad456592d60cb4b40981fa2429a:/hmac.h

diff --git a/hmac.h b/hmac.h
index d64003f..b489e54 100644
--- a/hmac.h
+++ b/hmac.h
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: hmac.h,v 1.2 1999/12/10 23:17:39 mdw Exp $
+ * $Id: hmac.h,v 1.4 2000/10/15 19:09:20 mdw Exp $
  *
  * Generic code for HMAC and NMAC
  *
@@ -30,6 +30,13 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: hmac.h,v $
+ * Revision 1.4  2000/10/15 19:09:20  mdw
+ * Support HMAC mode for hash functions which need to store more state than
+ * the hash output size.
+ *
+ * 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.
  *
@@ -81,9 +88,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;								\
 									\
@@ -91,10 +98,14 @@ 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[];					\
+									\
 /* --- @pre_nmacinit@ --- *						\
  *									\
  * Arguments:	@pre_macctx *key@ = pointer to a MAC key object		\