Uprating of the passphrase pixie.

[u/mdw/catacomb] / rmd160.h

diff --git a/rmd160.h b/rmd160.h
index 5aa9579..13c7701 100644 (file)
--- a/rmd160.h
+++ b/rmd160.h
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: rmd160.h,v 1.1 1999/09/03 08:41:12 mdw Exp $
+ * $Id: rmd160.h,v 1.5 2004/04/08 01:36:15 mdw Exp $
  *
  * The RIPEMD-160 message digest function
  *
@@ -27,14 +27,6 @@
  * MA 02111-1307, USA.
  */
 
-/*----- Revision history --------------------------------------------------* 
- *
- * $Log: rmd160.h,v $
- * Revision 1.1  1999/09/03 08:41:12  mdw
- * Initial import.
- *
- */
-
 /*----- Notes on the RIPEMD-160 hash function -----------------------------*
  *
  * RIPEMD-160 was invented by Hans Dobbertin, Antoon Bosselaers and Bart
@@ -45,8 +37,8 @@
  * best alternative hash function.
  */
 
-#ifndef RMD160_H
-#define RMD160_H
+#ifndef CATACOMB_RMD160_H
+#define CATACOMB_RMD160_H
 
 #ifdef __cplusplus
   extern "C" {
@@ -56,17 +48,22 @@
 
 #include <mLib/bits.h>
 
+#ifndef CATACOMB_GHASH_H
+#  include "ghash.h"
+#endif
+
 /*----- Magic numbers -----------------------------------------------------*/
 
 #define RMD160_BUFSZ 64
 #define RMD160_HASHSZ 20
+#define RMD160_STATESZ 20
 
 /*----- Data structures ---------------------------------------------------*/
 
 typedef struct rmd160_ctx {
   uint32 a, b, c, d, e;                        /* Chaining variables */
-  unsigned long count;                 /* Byte count so far */
-  int off;                             /* Offset into buffer */
+  uint32 nl, nh;                       /* Byte count so far */
+  unsigned off;                                /* Offset into buffer */
   octet buf[RMD160_BUFSZ];             /* Accumulation buffer */
 } rmd160_ctx;
 
@@ -151,6 +148,10 @@ extern void rmd160_done(rmd160_ctx */*ctx*/, void */*hash*/);
 
 extern unsigned long rmd160_state(rmd160_ctx */*ctx*/, void */*state*/);
 
+/*----- Generic hash interface --------------------------------------------*/
+
+extern const gchash rmd160;
+
 /*----- That's all, folks -------------------------------------------------*/
 
 #ifdef __cplusplus