X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/4dd00d47fc140dd7ec4310d8a49e7ddcc55678a9..20fa0f6976d598481208c0583d72b2ccef637be9:/sha.h

diff --git a/sha.h b/sha.h
index ec00cc9..0ce367a 100644
--- a/sha.h
+++ b/sha.h
@@ -1,13 +1,13 @@
 /* -*-c-*-
  *
- * $Id: sha.h,v 1.2 1999/11/19 13:20:08 mdw Exp $
+ * $Id: sha.h,v 1.6 2004/04/08 01:36:15 mdw Exp $
  *
  * Implementation of the SHA-1 hash function
  *
  * (c) 1999 Straylight/Edgeware
  */
 
-/*----- Licensing notice --------------------------------------------------* 
+/*----- Licensing notice --------------------------------------------------*
  *
  * This file is part of Catacomb.
  *
@@ -15,29 +15,18 @@
  * it under the terms of the GNU Library General Public License as
  * published by the Free Software Foundation; either version 2 of the
  * License, or (at your option) any later version.
- * 
+ *
  * Catacomb is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Library General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Library General Public
  * License along with Catacomb; if not, write to the Free
  * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
  * MA 02111-1307, USA.
  */
 
-/*----- Revision history --------------------------------------------------* 
- *
- * $Log: sha.h,v $
- * 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.
- *
- */
-
 /*----- Notes on the SHA-1 hash function ----------------------------------*
  *
  * SHA (Secure Hash Algorithm) was designed by the NSA, for use with the
@@ -47,8 +36,8 @@
  * 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" {
@@ -58,17 +47,22 @@
 
 #include <mLib/bits.h>
 
+#ifndef CATACOMB_GHASH_H
+#  include "ghash.h"
+#endif
+
 /*----- Magic numbers -----------------------------------------------------*/
 
 #define SHA_BUFSZ 64
 #define SHA_HASHSZ 20
+#define SHA_STATESZ 20
 
 /*----- Data structures ---------------------------------------------------*/
 
 typedef struct sha_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[SHA_BUFSZ];			/* Accumulation buffer */
 } sha_ctx;
 
@@ -152,6 +146,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