X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/d9a8ae10c5e1b3a1b10b34c0e92827135375e02f..dc2f0497fdfded94ef783b9a34943f26c85aba2b:/md5.c

diff --git a/md5.c b/md5.c
index c6e2a2a..55a0aaa 100644
--- a/md5.c
+++ b/md5.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: md5.c,v 1.1 1999/09/03 08:41:12 mdw Exp $
+ * $Id: md5.c,v 1.2 1999/12/10 23:20:03 mdw Exp $
  *
  * The MD5 message digest function
  *
@@ -30,6 +30,9 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: md5.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 "md5.h"
 
@@ -187,7 +192,7 @@ void md5_init(md5_ctx *ctx)
   ctx->c = 0x98badcfe;
   ctx->d = 0x10325476;
   ctx->off = 0;
-  ctx->count = 0;
+  ctx->nl = ctx->nh = 0;
 }
 
 /* --- @md5_set@ --- *
@@ -211,7 +216,8 @@ void md5_set(md5_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);
 }
 
 /* --- @md5_hash@ --- *
@@ -269,9 +275,13 @@ unsigned long md5_state(md5_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(MD5, md5)
+
 /* --- Test code --- */
 
 HASH_TEST(MD5, md5)