New generic hash operation for copying hash contexts.

diff --git a/ghash-def.h b/ghash-def.h
index d8dfc3c..74699ca 100644 (file)
--- a/ghash-def.h
+++ b/ghash-def.h
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: ghash-def.h,v 1.3 2000/07/02 18:27:42 mdw Exp $
+ * $Id: ghash-def.h,v 1.4 2000/07/15 10:00:58 mdw Exp $
  *
  * Definitions for generic hash interface
  *
@@ -30,6 +30,9 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: ghash-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
@@ -113,7 +116,16 @@ static void ghdestroy(ghash *h)                                            \
   S_DESTROY(g);                                                                \
 }                                                                      \
                                                                        \
-static const ghash_ops gops = { &pre, ghhash, ghdone, ghdestroy };     \
+static ghash *ghcopy(ghash *h)                                         \
+{                                                                      \
+  gctx *g = (gctx *)h;                                                 \
+  gctx *gg = S_CREATE(gctx);                                           \
+  memcpy(gg, g, sizeof(gctx));                                         \
+  return (&gg->h);                                                     \
+}                                                                      \
+                                                                       \
+static const ghash_ops gops =                                          \
+  { &pre, ghhash, ghdone, ghdestroy, ghcopy };                         \
 const gchash pre = { #pre, PRE##_HASHSZ, ghinit };
 
 /*----- That's all, folks -------------------------------------------------*/

diff --git a/ghash.h b/ghash.h
index 725a0a3..61f8aae 100644 (file)
--- a/ghash.h
+++ b/ghash.h
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: ghash.h,v 1.4 2000/07/03 18:08:24 mdw Exp $
+ * $Id: ghash.h,v 1.5 2000/07/15 10:00:58 mdw Exp $
  *
  * Generic hash function interface
  *
@@ -30,6 +30,9 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: ghash.h,v $
+ * Revision 1.5  2000/07/15 10:00:58  mdw
+ * New generic hash operation for copying hash contexts.
+ *
  * Revision 1.4  2000/07/03 18:08:24  mdw
  * Include `bits.h'.
  *
@@ -71,6 +74,7 @@ typedef struct ghash_ops {
   void (*hash)(ghash */*h*/, const void */*p*/, size_t /*sz*/); /* Hash */
   octet *(*done)(ghash */*h*/, void */*buf*/); /* Write result */
   void (*destroy)(ghash */*h*/);       /* Destroy hash block */
+  ghash *(*copy)(ghash */*h*/);                /* Make a copy of the hash context */
 } ghash_ops;
 
 typedef struct gchash {

diff --git a/hmac-def.h b/hmac-def.h
index 38dd64a..a8f2640 100644 (file)
--- a/hmac-def.h
+++ b/hmac-def.h
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: hmac-def.h,v 1.3 2000/07/02 18:27:42 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,9 @@
 /*----- 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
@@ -253,6 +256,14 @@ static octet *ghdone(ghash *h, void *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)                                                \
 {                                                                      \
   gctx *g = (gctx *)h;                                                 \
@@ -278,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)