New hash interface requirements.

[u/mdw/catacomb] / md4.c

diff --git a/md4.c b/md4.c
index 406c3a0..19c74d2 100644 (file)
--- a/md4.c
+++ b/md4.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: md4.c,v 1.1 1999/09/03 08:41:12 mdw Exp $
+ * $Id: md4.c,v 1.2 1999/12/10 23:20:03 mdw Exp $
  *
  * The MD4 message digest function
  *
@@ -30,6 +30,9 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: md4.c,v $
+ * Revision 1.2  1999/12/10 23:20:03  mdw
+ * New hash interface requirements.
+ *
  * Revision 1.1  1999/09/03 08:41:12  mdw
  * Initial import.
  *
@@ -39,6 +42,8 @@
 
 #include <mLib/bits.h>
 
+#include "ghash.h"
+#include "ghash-def.h"
 #include "hash.h"
 #include "md4.h"
 
@@ -168,7 +173,7 @@ void md4_init(md4_ctx *ctx)
   ctx->c = 0x98badcfe;
   ctx->d = 0x10325476;
   ctx->off = 0;
-  ctx->count = 0;
+  ctx->nl = ctx->nh = 0;
 }
 
 /* --- @md4_set@ --- *
@@ -192,7 +197,8 @@ void md4_set(md4_ctx *ctx, const void *buf, unsigned long count)
   ctx->c = LOAD32_L(p +  8);
   ctx->d = LOAD32_L(p + 12);
   ctx->off = 0;
-  ctx->count = count;
+  ctx->nl = U32(count);
+  ctx->nh = U32((count >> 16) >> 16);
 }
 
 /* --- @md4_hash@ --- *
@@ -250,9 +256,13 @@ unsigned long md4_state(md4_ctx *ctx, void *state)
   STORE32_L(p +  4, ctx->b);
   STORE32_L(p +  8, ctx->c);
   STORE32_L(p + 12, ctx->d);
-  return (ctx->count);
+  return (ctx->nl | ((ctx->nh >> 16) >> 16));
 }
 
+/* --- Generic interface --- */
+
+GHASH_DEF(MD4, md4)
+
 /* --- Test rig --- */
 
 HASH_TEST(MD4, md4)