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

diff --git a/md5.c b/md5.c
index c6e2a2a..a062c72 100644
--- a/md5.c
+++ b/md5.c
@@ -1,13 +1,13 @@
 /* -*-c-*-
  *
- * $Id: md5.c,v 1.1 1999/09/03 08:41:12 mdw Exp $
+ * $Id: md5.c,v 1.4 2004/04/08 01:36:15 mdw Exp $
  *
  * The MD5 message digest function
  *
  * (c) 1998 Straylight/Edgeware
  */
 
-/*----- Licensing notice --------------------------------------------------* 
+/*----- Licensing notice --------------------------------------------------*
  *
  * This file is part of Catacomb.
  *
@@ -15,30 +15,24 @@
  * 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: md5.c,v $
- * Revision 1.1  1999/09/03 08:41:12  mdw
- * Initial import.
- *
- */
-
 /*----- Header files ------------------------------------------------------*/
 
 #include <mLib/bits.h>
 
+#include "ghash.h"
+#include "ghash-def.h"
 #include "hash.h"
 #include "md5.h"
 
@@ -187,7 +181,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@ --- *
@@ -206,12 +200,13 @@ void md5_init(md5_ctx *ctx)
 void md5_set(md5_ctx *ctx, const void *buf, unsigned long count)
 {
   const octet *p = buf;
-  ctx->a = LOAD32_L(p +  0);
-  ctx->b = LOAD32_L(p +  4);
-  ctx->c = LOAD32_L(p +  8);
+  ctx->a = LOAD32_L(p +	 0);
+  ctx->b = LOAD32_L(p +	 4);
+  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 & ~MASK32) >> 16) >> 16);
 }
 
 /* --- @md5_hash@ --- *
@@ -245,9 +240,9 @@ void md5_done(md5_ctx *ctx, void *hash)
 {
   octet *p = hash;
   HASH_MD5STRENGTH(MD5, md5, ctx);
-  STORE32_L(p +  0, ctx->a);
-  STORE32_L(p +  4, ctx->b);
-  STORE32_L(p +  8, ctx->c);
+  STORE32_L(p +	 0, ctx->a);
+  STORE32_L(p +	 4, ctx->b);
+  STORE32_L(p +	 8, ctx->c);
   STORE32_L(p + 12, ctx->d);
 }
 
@@ -265,13 +260,17 @@ void md5_done(md5_ctx *ctx, void *hash)
 unsigned long md5_state(md5_ctx *ctx, void *state)
 {
   octet *p = state;
-  STORE32_L(p +  0, ctx->a);
-  STORE32_L(p +  4, ctx->b);
-  STORE32_L(p +  8, ctx->c);
+  STORE32_L(p +	 0, ctx->a);
+  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)