New hash interface requirements.

[u/mdw/catacomb] / sha.h

diff --git a/sha.h b/sha.h
index 8f72def..c231da0 100644 (file)
--- a/sha.h
+++ b/sha.h
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: sha.h,v 1.1 1999/09/03 08:41:12 mdw Exp $
+ * $Id: sha.h,v 1.3 1999/12/10 23:20:03 mdw Exp $
  *
  * Implementation of the SHA-1 hash function
  *
@@ -30,6 +30,12 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: sha.h,v $
+ * Revision 1.3  1999/12/10 23:20:03  mdw
+ * New hash interface requirements.
+ *
+ * Revision 1.2  1999/11/19 13:20:08  mdw
+ * Modify notes section slightly.
+ *
  * Revision 1.1  1999/09/03 08:41:12  mdw
  * Initial import.
  *
@@ -38,13 +44,14 @@
 /*----- Notes on the SHA-1 hash function ----------------------------------*
  *
  * SHA (Secure Hash Algorithm) was designed by the NSA, for use with the
- * Digital Signature Algorithm.  It has gained wide acceptance since then,
- * and is probably now most people's collision-resistant function of choice.
- * The author prefers RIPEMD-160, for no particularly good reasons.
+ * Digital Signature Algorithm.  It is defined by FIPS 180-1.  It has gained
+ * wide acceptance since its initial publication, and is probably now most
+ * people's collision-resistant function of choice.  The author prefers
+ * RIPEMD-160, for no particularly good reasons.
  */
 
-#ifndef SHA_H
-#define SHA_H
+#ifndef CATACOMB_SHA_H
+#define CATACOMB_SHA_H
 
 #ifdef __cplusplus
   extern "C" {
@@ -54,6 +61,10 @@
 
 #include <mLib/bits.h>
 
+#ifndef CATACOMB_GHASH_H
+#  include "ghash.h"
+#endif
+
 /*----- Magic numbers -----------------------------------------------------*/
 
 #define SHA_BUFSZ 64
@@ -63,7 +74,7 @@
 
 typedef struct sha_ctx {
   uint32 a, b, c, d, e;                        /* Chaining variables */
-  unsigned long count;                 /* Byte count so far */
+  uint32 nl, nh;                       /* Byte count so far */
   int off;                             /* Offset into buffer */
   octet buf[SHA_BUFSZ];                        /* Accumulation buffer */
 } sha_ctx;
@@ -148,6 +159,10 @@ extern void sha_done(sha_ctx */*ctx*/, void */*hash*/);
 
 extern unsigned long sha_state(sha_ctx */*ctx*/, void */*state*/);
 
+/*----- Generic hash interface --------------------------------------------*/
+
+extern const gchash sha;
+
 /*----- That's all, folks -------------------------------------------------*/
 
 #ifdef __cplusplus