X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/d03ab969116fe715d569304c1c474749b2f64529..02dfbd5b7af7816959dbd39c1fe628451204e35f:/md5.h

diff --git a/md5.h b/md5.h
index 8c54e6d..e09dfa3 100644
--- a/md5.h
+++ b/md5.h
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: md5.h,v 1.1 1999/09/03 08:41:12 mdw Exp $
+ * $Id: md5.h,v 1.5 2004/04/08 01:36:15 mdw Exp $
  *
  * The MD5 message digest function
  *
@@ -27,14 +27,6 @@
  * MA 02111-1307, USA.
  */
 
-/*----- Revision history --------------------------------------------------* 
- *
- * $Log: md5.h,v $
- * Revision 1.1  1999/09/03 08:41:12  mdw
- * Initial import.
- *
- */
-
 /*----- Notes on the MD5 hash function ------------------------------------*
  *
  * MD5 was designed by Ron Rivest.  It was intended to be a more conservative
@@ -45,8 +37,8 @@
  * applications.  It's also still useful in constructions such as HMAC.
  */
 
-#ifndef MD5_H
-#define MD5_H
+#ifndef CATACOMB_MD5_H
+#define CATACOMB_MD5_H
 
 #ifdef __cplusplus
   extern "C" {
@@ -56,17 +48,22 @@
 
 #include <mLib/bits.h>
 
+#ifndef CATACOMB_GHASH_H
+#  include "ghash.h"
+#endif
+
 /*----- Magic numbers -----------------------------------------------------*/
 
 #define MD5_BUFSZ 64
 #define MD5_HASHSZ 16
+#define MD5_STATESZ 16
 
 /*----- Data structures ---------------------------------------------------*/
 
 typedef struct md5_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[MD5_BUFSZ];			/* Accumulation buffer */
 } md5_ctx;
 
@@ -150,6 +147,10 @@ extern void md5_done(md5_ctx */*ctx*/, void */*hash*/);
 
 extern unsigned long md5_state(md5_ctx */*ctx*/, void */*state*/);
 
+/*----- Generic hash interface --------------------------------------------*/
+
+extern const gchash md5;
+
 /*----- That's all, folks -------------------------------------------------*/
 
 #ifdef __cplusplus