/* -*-c-*-
*
- * $Id: ghash-def.h,v 1.1 1999/12/10 23:21:37 mdw Exp $
+ * $Id: ghash-def.h,v 1.7 2004/04/08 01:36:15 mdw Exp $
*
* Definitions for generic hash interface
*
* (c) 1999 Straylight/Edgeware
*/
-/*----- Licensing notice --------------------------------------------------*
+/*----- Licensing notice --------------------------------------------------*
*
* This file is part of Catacomb.
*
* it under the terms of the GNU Library General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
- *
+ *
* Catacomb is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Library General Public License for more details.
- *
+ *
* You should have received a copy of the GNU Library General Public
* License along with Catacomb; if not, write to the Free
* Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
* MA 02111-1307, USA.
*/
-/*----- Revision history --------------------------------------------------*
- *
- * $Log: ghash-def.h,v $
- * Revision 1.1 1999/12/10 23:21:37 mdw
- * Generic interface.
- *
- */
-
#ifndef CATACOMB_GHASH_DEF_H
#define CATACOMB_GHASH_DEF_H
#include <mLib/bits.h>
#include <mLib/sub.h>
+#ifndef CATACOMB_ARENA_H
+# include "arena.h"
+#endif
+
#ifndef CATACOMB_GHASH_H
# include "ghash.h"
#endif
+#ifndef CATACOMB_PARANOIA_H
+# include "paranoia.h"
+#endif
+
/*----- Generic hash function interface -----------------------------------*/
/* --- @GHASH_DEF@ --- *
typedef struct gctx { \
ghash h; \
pre##_ctx c; \
+ octet buf[PRE##_HASHSZ]; \
} gctx; \
\
static ghash *ghinit(void) \
{ \
- gctx *g = CREATE(gctx); \
+ gctx *g = S_CREATE(gctx); \
g->h.ops = &gops; \
pre##_init(&g->c); \
return (&g->h); \
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; \
- DESTROY(g); \
+ BURN(*g); \
+ S_DESTROY(g); \
+} \
+ \
+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.b, ghhash, ghdone, ghdestroy }; \
-const gchash pre = { { #pre, PRE##_HASHSZ }, ghinit };
+static const ghash_ops gops = \
+ { &pre, ghhash, ghdone, ghdestroy, ghcopy }; \
+const gchash pre = { #pre, PRE##_HASHSZ, ghinit, PRE##_BUFSZ };
/*----- That's all, folks -------------------------------------------------*/