Merge branch 'master' of git+ssh://metalzone.distorted.org.uk/~mdw/public-git/catacomb/

[u/mdw/catacomb] / rmd160.c

diff --git a/rmd160.c b/rmd160.c
index a42c21c..05a2c5d 100644 (file)
--- a/rmd160.c
+++ b/rmd160.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: rmd160.c,v 1.1 1999/09/03 08:41:12 mdw Exp $
+ * $Id: rmd160.c,v 1.4 2004/04/08 01:36:15 mdw Exp $
  *
  * The RIPEMD-160 message digest function
  *
@@ -27,18 +27,12 @@
  * MA 02111-1307, USA.
  */
 
-/*----- Revision history --------------------------------------------------*
- *
- * $Log: rmd160.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 "rmd160.h"
 
@@ -307,7 +301,7 @@ void rmd160_init(rmd160_ctx *ctx)
   ctx->d = 0x10325476;
   ctx->e = 0xc3d2e1f0;
   ctx->off = 0;
-  ctx->count = 0;
+  ctx->nl = ctx->nh = 0;
 }
 
 /* --- @rmd160_set@ --- *
@@ -332,7 +326,8 @@ void rmd160_set(rmd160_ctx *ctx, const void *buf, unsigned long count)
   ctx->d = LOAD32_L(p + 12);
   ctx->e = LOAD32_L(p + 16);
   ctx->off = 0;
-  ctx->count = count;
+  ctx->nl = U32(count);
+  ctx->nh = U32(((count & ~MASK32) >> 16) >> 16);
 }
 
 /* --- @rmd160_hash@ --- *
@@ -392,9 +387,13 @@ unsigned long rmd160_state(rmd160_ctx *ctx, void *state)
   STORE32_L(p +  8, ctx->c);
   STORE32_L(p + 12, ctx->d);
   STORE32_L(p + 16, ctx->e);
-  return (ctx->count);
+  return (ctx->nl | ((ctx->nh << 16) << 16));
 }
 
+/* --- Generic interface --- */
+
+GHASH_DEF(RMD160, rmd160)
+
 /* --- Test code --- */
 
 HASH_TEST(RMD160, rmd160)