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

diff --git a/ghash-def.h b/ghash-def.h
index db87d1f..3f0266c 100644
--- a/ghash-def.h
+++ b/ghash-def.h
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: ghash-def.h,v 1.2 2000/06/17 11:22:03 mdw Exp $
+ * $Id: ghash-def.h,v 1.7 2004/04/08 01:36:15 mdw Exp $
  *
  * Definitions for generic hash interface
  *
@@ -27,18 +27,6 @@
  * MA 02111-1307, USA.
  */
 
-/*----- Revision history --------------------------------------------------* 
- *
- * $Log: ghash-def.h,v $
- * Revision 1.2  2000/06/17 11:22:03  mdw
- * Use secure arena for memory allocation.  Minor changes in the generic
- * hash interface.
- *
- * Revision 1.1  1999/12/10 23:21:37  mdw
- * Generic interface.
- *
- */
-
 #ifndef CATACOMB_GHASH_DEF_H
 #define CATACOMB_GHASH_DEF_H
 
@@ -59,6 +47,10 @@
 #  include "ghash.h"
 #endif
 
+#ifndef CATACOMB_PARANOIA_H
+#  include "paranoia.h"
+#endif
+
 /*----- Generic hash function interface -----------------------------------*/
 
 /* --- @GHASH_DEF@ --- *
@@ -75,6 +67,7 @@ static const ghash_ops gops;						\
 typedef struct gctx {							\
   ghash h;								\
   pre##_ctx c;								\
+  octet buf[PRE##_HASHSZ];						\
 } gctx;									\
 									\
 static ghash *ghinit(void)						\
@@ -91,20 +84,33 @@ static void ghhash(ghash *h, const void *p, size_t sz)			\
   pre##_hash(&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##_done(&g->c, buf);						\
+  return (buf);								\
 }									\
 									\
 static void ghdestroy(ghash *h)						\
 {									\
   gctx *g = (gctx *)h;							\
+  BURN(*g);								\
   S_DESTROY(g);								\
 }									\
 									\
-static const ghash_ops gops = { &pre, ghhash, ghdone, ghdestroy };	\
-const gchash pre = { #pre, PRE##_HASHSZ, ghinit };
+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, PRE##_BUFSZ };
 
 /*----- That's all, folks -------------------------------------------------*/