X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/28ef1f459bf28d73015d4e58afec778647eef5e0..c080c887f9304819f3df80195ed3670680e3f05c:/hmac-def.h

diff --git a/hmac-def.h b/hmac-def.h
index 0972b68..a8f2640 100644
--- a/hmac-def.h
+++ b/hmac-def.h
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: hmac-def.h,v 1.2 2000/06/17 11:23:44 mdw Exp $
+ * $Id: hmac-def.h,v 1.4 2000/07/15 10:00:58 mdw Exp $
  *
  * Definitions for HMAC and NMAC
  *
@@ -30,6 +30,15 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: hmac-def.h,v $
+ * Revision 1.4  2000/07/15 10:00:58  mdw
+ * New generic hash operation for copying hash contexts.
+ *
+ * Revision 1.3  2000/07/02 18:27:42  mdw
+ * (ghash->ops->done): Interface change.  Passing in a null buffer pointer
+ * uses a buffer internal to the ghash object.  The operation returns the
+ * address of the buffer it used.  Clients of generic hashes no longer need
+ * to use dynamically allocated memory for hash results.
+ *
  * Revision 1.2  2000/06/17 11:23:44  mdw
  * Use secure arena for memory allocation.  Minor changes in the generic
  * hash interface.
@@ -212,6 +221,7 @@ typedef struct gkctx {							\
 typedef struct gctx {							\
   ghash h;								\
   pre##_macctx c;							\
+  octet buf[PRE##_HASHSZ];						\
 } gctx;									\
 									\
 static ghash *gkinit(gmac *m)						\
@@ -237,10 +247,21 @@ static void ghhash(ghash *h, const void *p, size_t sz)			\
   pre##_machash(&g->c, p, sz);						\
 }									\
 									\
-static void ghdone(ghash *h, void *buf)					\
+static octet *ghdone(ghash *h, void *buf)				\
 {									\
   gctx *g = (gctx *)h;							\
+  if (!buf)								\
+    buf = g->buf;							\
   pre##_macdone(&g->c, buf);						\
+  return (buf);								\
+}									\
+									\
+static ghash *ghcopy(ghash *h)						\
+{									\
+  gctx *g = (gctx *)h;							\
+  gctx *gg = S_CREATE(gctx);						\
+  memcpy(gg, g, sizeof(gctx));						\
+  return (&gg->h);							\
 }									\
 									\
 static void ghdestroy(ghash *h)						\
@@ -268,7 +289,7 @@ const gcmac pre##_hmac =						\
 static const gmac_ops gkops = { &pre##_hmac, gkinit, gkdestroy };	\
 static const gchash gch = { #pre "-hmac", PRE##_HASHSZ, ghinit };	\
 static const ghash_ops gops =						\
-  { &gch, ghhash, ghdone, ghdestroy };					\
+  { &gch, ghhash, ghdone, ghdestroy, ghcopy };				\
 									\
 HMAC_TEST(PRE, pre)