===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/include/sha1.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -c -r1.4 -r1.5
*** src/include/sha1.h	1996/09/30 23:27:04	1.4
--- src/include/sha1.h	1997/07/10 22:53:01	1.5
***************
*** 1,57 ****
! /* --------------------------------- SHA1.H ------------------------------- */
!    
! /* NIST proposed Secure Hash Standard.
!    
!    Written 2 September 1992, Peter C. Gutmann.
!    This implementation placed in the public domain.
!    
!    Comments to pgut1@cs.aukuni.ac.nz */
  
  #ifndef _SHA1_H
  #define _SHA1_H
  
- /* The SHA1 block size and message digest sizes, in bytes */
- 
- #define SHA1_BLOCKSIZE   64
- #define SHA1_DIGESTSIZE  20
- 
- /* The structure for storing SHA1 info */
- 
  typedef struct {
! 	u_int32_t digest[ 5 ];		/* Message digest */
! 	u_int32_t countLo, countHi;	/* 64-bit bit count */
! 	u_int32_t data[ 16 ];		/* SHA1 data buffer */
! } SHA1_INFO;
! 
! /* The next def turns on the change to the algorithm introduced by NIST at
!  * the behest of the NSA.  It supposedly corrects a weakness in the original
!  * formulation.  Bruce Schneier described it thus in a posting to the
!  * Cypherpunks mailing list on June 21, 1994 (as told to us by Steve Bellovin):
!  *
!  *	This is the fix to the Secure Hash Standard, NIST FIPS PUB 180:
!  *
!  *	     In Section 7 of FIPS 180 (page 9), the line which reads
!  *
!  *	     "b) For t=16 to 79 let Wt = Wt-3 XOR Wt-8 XOR Wt-14 XOR
!  *	     Wt-16."
!  *
!  *	     is to be replaced by
!  *
!  *	     "b) For t=16 to 79 let Wt = S1(Wt-3 XOR Wt-8 XOR Wt-14 XOR
!  *	     Wt-16)."
!  *
!  *	     where S1 is a left circular shift by one bit as defined in
!  *	     Section 3 of FIPS 180 (page 6):
!  *
!  *	     S1(X) = (X<<1) OR (X>>31).
!  *
!  */
! #define NEW_SHA1
! 
! void sha1Init __P((SHA1_INFO *));
! void sha1Transform __P((SHA1_INFO *));
! void sha1Final __P((SHA1_INFO *));
! void sha1Update __P((SHA1_INFO *, unsigned char *, int));
! void sha1ByteReverse __P((u_int32_t *, int));
  
  #endif /* _SHA1_H */
--- 1,23 ----
! /*	$OpenBSD: sha1.h,v 1.5 1997/07/10 22:53:01 millert Exp $	*/
  
+ /*
+  * SHA-1 in C
+  * By Steve Reid <steve@edmweb.com>
+  * 100% Public Domain
+  */
+ 
  #ifndef _SHA1_H
  #define _SHA1_H
  
  typedef struct {
!     u_int32_t state[5];
!     u_int32_t count[2];  
!     u_char buffer[64];
! } SHA1_CTX;
!   
! void SHA1Transform __P((u_int32_t state[5], unsigned char buffer[64]));
! void SHA1Init __P((SHA1_CTX* context));
! void SHA1Update __P((SHA1_CTX* context, unsigned char* data, unsigned int len));
! void SHA1Final __P((unsigned char digest[20], SHA1_CTX* context));
  
  #endif /* _SHA1_H */