X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/aa1082f28ddd05f3b946ca1a9c6bfaa17d18aca5..92c494cebdce7068e6c9c0fe4363467719c8ed67:/ghash.h

diff --git a/ghash.h b/ghash.h
index 9cee338..3b83a19 100644
--- a/ghash.h
+++ b/ghash.h
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: ghash.h,v 1.1 1999/12/10 23:16:01 mdw Exp $
+ * $Id: ghash.h,v 1.7 2004/04/08 01:36:15 mdw Exp $
  *
  * Generic hash function interface
  *
@@ -27,14 +27,6 @@
  * MA 02111-1307, USA.
  */
 
-/*----- Revision history --------------------------------------------------* 
- *
- * $Log: ghash.h,v $
- * Revision 1.1  1999/12/10 23:16:01  mdw
- * Generic interface.
- *
- */
-
 #ifndef CATACOMB_GHASH_H
 #define CATACOMB_GHASH_H
 
@@ -46,29 +38,49 @@
 
 #include <stddef.h>
 
-/*----- Generic hash function interface -----------------------------------*/
+#include <mLib/bits.h>
 
-typedef struct gchash_base {
-  const char *name;			/* Name of the hash function */
-  size_t hashsz;			/* Size of output hash */
-} gchash_base;  
+/*----- Generic hash function interface -----------------------------------*/
 
 typedef struct ghash {
   const struct ghash_ops *ops;		/* Pointer to hash operations */
 } ghash;
 
 typedef struct ghash_ops {
-  const gchash_base *b;			/* Pointer to basic information */
+  const struct gchash *c;		/* Pointer to hash class */
   void (*hash)(ghash */*h*/, const void */*p*/, size_t /*sz*/); /* Hash */
-  void (*done)(ghash */*h*/, void */*buf*/); /* Write result */
+  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;
 
+#define GH_INIT(ch)		(ch)->init()
+#define GH_CLASS(h)		(h)->ops->c
+#define GH_HASH(h, p, sz)	(h)->ops->hash((h), (p), (sz))
+#define GH_DONE(h, buf)		(h)->ops->done((h), (buf))
+#define GH_DESTROY(h)		(h)->ops->destroy((h))
+#define GH_COPY(h)		(h)->ops->copy((h))
+
 typedef struct gchash {
-  gchash_base b;			/* Basic bits of information */
+  const char *name;			/* Name of the hash function */
+  size_t hashsz;			/* Size of output hash */
   ghash *(*init)(void);			/* Create a new hash instance */
+  size_t bufsz;				/* Buffer size, or zero */
 } gchash;
 
+/*----- Tables ------------------------------------------------------------*/
+
+extern const gchash *const ghashtab[];
+
+/* --- @ghash_byname@ --- *
+ *
+ * Arguments:	@const char *p@ = pointer to name string
+ *
+ * Returns:	The named cipher class, or null.
+ */
+
+extern const gchash *ghash_byname(const char */*p*/);
+
 /*----- That's all, folks -------------------------------------------------*/
 
 #ifdef __cplusplus