New hash interface requirements.

[u/mdw/catacomb] / md5.h

diff --git a/md5.h b/md5.h
index 8c54e6d..ca08dd1 100644 (file)
--- 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.2 1999/12/10 23:20:03 mdw Exp $
  *
  * The MD5 message digest function
  *
@@ -30,6 +30,9 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: md5.h,v $
+ * Revision 1.2  1999/12/10 23:20:03  mdw
+ * New hash interface requirements.
+ *
  * Revision 1.1  1999/09/03 08:41:12  mdw
  * Initial import.
  *
@@ -45,8 +48,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,6 +59,10 @@
 
 #include <mLib/bits.h>
 
+#ifndef CATACOMB_GHASH_H
+#  include "ghash.h"
+#endif
+
 /*----- Magic numbers -----------------------------------------------------*/
 
 #define MD5_BUFSZ 64
@@ -65,7 +72,7 @@
 
 typedef struct md5_ctx {
   uint32 a, b, c, d;                   /* Chaining variables */
-  unsigned long count;                 /* Byte count so far */
+  uint32 nl, nh;                       /* Byte count so far */
   int off;                             /* Offset into buffer */
   octet buf[MD5_BUFSZ];                        /* Accumulation buffer */
 } md5_ctx;
@@ -150,6 +157,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