X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/d03ab969116fe715d569304c1c474749b2f64529..80be023065ced106a4078a36371c135a60d2bd6c:/md4.h

diff --git a/md4.h b/md4.h
index 1697814..411bb59 100644
--- a/md4.h
+++ b/md4.h
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: md4.h,v 1.1 1999/09/03 08:41:12 mdw Exp $
+ * $Id: md4.h,v 1.5 2004/04/08 01:36:15 mdw Exp $
  *
  * The MD4 message digest function
  *
@@ -27,14 +27,6 @@
  * MA 02111-1307, USA.
  */
 
-/*----- Revision history --------------------------------------------------* 
- *
- * $Log: md4.h,v $
- * Revision 1.1  1999/09/03 08:41:12  mdw
- * Initial import.
- *
- */
-
 /*----- Notes on the MD4 hash function ------------------------------------*
  *
  * MD4 was designed by Ron Rivest.  It's now well and truly broken: not only
@@ -44,8 +36,8 @@
  * cryptographically strong, 'cos it ain't.
  */
 
-#ifndef MD4_H
-#define MD4_H
+#ifndef CATACOMB_MD4_H
+#define CATACOMB_MD4_H
 
 #ifdef __cplusplus
   extern "C" {
@@ -55,17 +47,22 @@
 
 #include <mLib/bits.h>
 
+#ifndef CATACOMB_GHASH_H
+#  include "ghash.h"
+#endif
+
 /*----- Magic numbers -----------------------------------------------------*/
 
 #define MD4_BUFSZ 64
 #define MD4_HASHSZ 16
+#define MD4_STATESZ 16
 
 /*----- Data structures ---------------------------------------------------*/
 
 typedef struct md4_ctx {
   uint32 a, b, c, d;			/* 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[MD4_BUFSZ];			/* Accumulation buffer */
 } md4_ctx;
 
@@ -149,6 +146,10 @@ extern void md4_done(md4_ctx */*ctx*/, void */*hash*/);
 
 extern unsigned long md4_state(md4_ctx */*ctx*/, void */*state*/);
 
+/*----- Generic hash interface --------------------------------------------*/
+
+extern const gchash md4;
+
 /*----- That's all, folks -------------------------------------------------*/
 
 #ifdef __cplusplus