===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/include/sha2.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -c -r1.6 -r1.7
*** src/include/sha2.h	2004/06/22 01:57:30	1.6
--- src/include/sha2.h	2008/09/06 12:00:19	1.7
***************
*** 1,4 ****
! /*	$OpenBSD: sha2.h,v 1.6 2004/06/22 01:57:30 jfb Exp $	*/
  
  /*
   * FILE:	sha2.h
--- 1,4 ----
! /*	$OpenBSD: sha2.h,v 1.7 2008/09/06 12:00:19 djm Exp $	*/
  
  /*
   * FILE:	sha2.h
***************
*** 50,120 ****
  #define SHA512_DIGEST_STRING_LENGTH	(SHA512_DIGEST_LENGTH * 2 + 1)
  
  
! /*** SHA-256/384/512 Context Structures *******************************/
! typedef struct _SHA256_CTX {
! 	u_int32_t	state[8];
! 	u_int64_t	bitcount;
! 	u_int8_t	buffer[SHA256_BLOCK_LENGTH];
! } SHA256_CTX;
! typedef struct _SHA512_CTX {
! 	u_int64_t	state[8];
  	u_int64_t	bitcount[2];
  	u_int8_t	buffer[SHA512_BLOCK_LENGTH];
! } SHA512_CTX;
  
- typedef SHA512_CTX SHA384_CTX;
- 
  #include <sys/cdefs.h>
  
  __BEGIN_DECLS
! void SHA256_Init(SHA256_CTX *);
! void SHA256_Transform(u_int32_t state[8], const u_int8_t [SHA256_BLOCK_LENGTH]);
! void SHA256_Update(SHA256_CTX *, const u_int8_t *, size_t)
  	__attribute__((__bounded__(__string__,2,3)));
! void SHA256_Pad(SHA256_CTX *);
! void SHA256_Final(u_int8_t [SHA256_DIGEST_LENGTH], SHA256_CTX *)
  	__attribute__((__bounded__(__minbytes__,1,SHA256_DIGEST_LENGTH)));
! char *SHA256_End(SHA256_CTX *, char *)
  	__attribute__((__bounded__(__minbytes__,2,SHA256_DIGEST_STRING_LENGTH)));
! char *SHA256_File(const char *, char *)
  	__attribute__((__bounded__(__minbytes__,2,SHA256_DIGEST_STRING_LENGTH)));
! char *SHA256_FileChunk(const char *, char *, off_t, off_t)
  	__attribute__((__bounded__(__minbytes__,2,SHA256_DIGEST_STRING_LENGTH)));
! char *SHA256_Data(const u_int8_t *, size_t, char *)
  	__attribute__((__bounded__(__string__,1,2)))
  	__attribute__((__bounded__(__minbytes__,3,SHA256_DIGEST_STRING_LENGTH)));
  
! void SHA384_Init(SHA384_CTX *);
! void SHA384_Transform(u_int64_t state[8], const u_int8_t [SHA384_BLOCK_LENGTH]);
! void SHA384_Update(SHA384_CTX *, const u_int8_t *, size_t)
  	__attribute__((__bounded__(__string__,2,3)));
! void SHA384_Pad(SHA384_CTX *);
! void SHA384_Final(u_int8_t [SHA384_DIGEST_LENGTH], SHA384_CTX *)
  	__attribute__((__bounded__(__minbytes__,1,SHA384_DIGEST_LENGTH)));
! char *SHA384_End(SHA384_CTX *, char *)
  	__attribute__((__bounded__(__minbytes__,2,SHA384_DIGEST_STRING_LENGTH)));
! char *SHA384_File(const char *, char *)
  	__attribute__((__bounded__(__minbytes__,2,SHA384_DIGEST_STRING_LENGTH)));
! char *SHA384_FileChunk(const char *, char *, off_t, off_t)
  	__attribute__((__bounded__(__minbytes__,2,SHA384_DIGEST_STRING_LENGTH)));
! char *SHA384_Data(const u_int8_t *, size_t, char *)
  	__attribute__((__bounded__(__string__,1,2)))
  	__attribute__((__bounded__(__minbytes__,3,SHA384_DIGEST_STRING_LENGTH)));
  
! void SHA512_Init(SHA512_CTX *);
! void SHA512_Transform(u_int64_t state[8], const u_int8_t [SHA512_BLOCK_LENGTH]);
! void SHA512_Update(SHA512_CTX *, const u_int8_t *, size_t)
  	__attribute__((__bounded__(__string__,2,3)));
! void SHA512_Pad(SHA512_CTX *);
! void SHA512_Final(u_int8_t [SHA512_DIGEST_LENGTH], SHA512_CTX *)
  	__attribute__((__bounded__(__minbytes__,1,SHA512_DIGEST_LENGTH)));
! char *SHA512_End(SHA512_CTX *, char *)
  	__attribute__((__bounded__(__minbytes__,2,SHA512_DIGEST_STRING_LENGTH)));
! char *SHA512_File(const char *, char *)
  	__attribute__((__bounded__(__minbytes__,2,SHA512_DIGEST_STRING_LENGTH)));
! char *SHA512_FileChunk(const char *, char *, off_t, off_t)
  	__attribute__((__bounded__(__minbytes__,2,SHA512_DIGEST_STRING_LENGTH)));
! char *SHA512_Data(const u_int8_t *, size_t, char *)
  	__attribute__((__bounded__(__string__,1,2)))
  	__attribute__((__bounded__(__minbytes__,3,SHA512_DIGEST_STRING_LENGTH)));
  __END_DECLS
--- 50,116 ----
  #define SHA512_DIGEST_STRING_LENGTH	(SHA512_DIGEST_LENGTH * 2 + 1)
  
  
! /*** SHA-256/384/512 Context Structure *******************************/
! typedef struct _SHA2_CTX {
! 	union {
! 		u_int32_t	st32[8];
! 		u_int64_t	st64[8];
! 	} state;
  	u_int64_t	bitcount[2];
  	u_int8_t	buffer[SHA512_BLOCK_LENGTH];
! } SHA2_CTX;
  
  #include <sys/cdefs.h>
  
  __BEGIN_DECLS
! void SHA256Init(SHA2_CTX *);
! void SHA256Transform(u_int32_t state[8], const u_int8_t [SHA256_BLOCK_LENGTH]);
! void SHA256Update(SHA2_CTX *, const u_int8_t *, size_t)
  	__attribute__((__bounded__(__string__,2,3)));
! void SHA256Pad(SHA2_CTX *);
! void SHA256Final(u_int8_t [SHA256_DIGEST_LENGTH], SHA2_CTX *)
  	__attribute__((__bounded__(__minbytes__,1,SHA256_DIGEST_LENGTH)));
! char *SHA256End(SHA2_CTX *, char *)
  	__attribute__((__bounded__(__minbytes__,2,SHA256_DIGEST_STRING_LENGTH)));
! char *SHA256File(const char *, char *)
  	__attribute__((__bounded__(__minbytes__,2,SHA256_DIGEST_STRING_LENGTH)));
! char *SHA256FileChunk(const char *, char *, off_t, off_t)
  	__attribute__((__bounded__(__minbytes__,2,SHA256_DIGEST_STRING_LENGTH)));
! char *SHA256Data(const u_int8_t *, size_t, char *)
  	__attribute__((__bounded__(__string__,1,2)))
  	__attribute__((__bounded__(__minbytes__,3,SHA256_DIGEST_STRING_LENGTH)));
  
! void SHA384Init(SHA2_CTX *);
! void SHA384Transform(u_int64_t state[8], const u_int8_t [SHA384_BLOCK_LENGTH]);
! void SHA384Update(SHA2_CTX *, const u_int8_t *, size_t)
  	__attribute__((__bounded__(__string__,2,3)));
! void SHA384Pad(SHA2_CTX *);
! void SHA384Final(u_int8_t [SHA384_DIGEST_LENGTH], SHA2_CTX *)
  	__attribute__((__bounded__(__minbytes__,1,SHA384_DIGEST_LENGTH)));
! char *SHA384End(SHA2_CTX *, char *)
  	__attribute__((__bounded__(__minbytes__,2,SHA384_DIGEST_STRING_LENGTH)));
! char *SHA384File(const char *, char *)
  	__attribute__((__bounded__(__minbytes__,2,SHA384_DIGEST_STRING_LENGTH)));
! char *SHA384FileChunk(const char *, char *, off_t, off_t)
  	__attribute__((__bounded__(__minbytes__,2,SHA384_DIGEST_STRING_LENGTH)));
! char *SHA384Data(const u_int8_t *, size_t, char *)
  	__attribute__((__bounded__(__string__,1,2)))
  	__attribute__((__bounded__(__minbytes__,3,SHA384_DIGEST_STRING_LENGTH)));
  
! void SHA512Init(SHA2_CTX *);
! void SHA512Transform(u_int64_t state[8], const u_int8_t [SHA512_BLOCK_LENGTH]);
! void SHA512Update(SHA2_CTX *, const u_int8_t *, size_t)
  	__attribute__((__bounded__(__string__,2,3)));
! void SHA512Pad(SHA2_CTX *);
! void SHA512Final(u_int8_t [SHA512_DIGEST_LENGTH], SHA2_CTX *)
  	__attribute__((__bounded__(__minbytes__,1,SHA512_DIGEST_LENGTH)));
! char *SHA512End(SHA2_CTX *, char *)
  	__attribute__((__bounded__(__minbytes__,2,SHA512_DIGEST_STRING_LENGTH)));
! char *SHA512File(const char *, char *)
  	__attribute__((__bounded__(__minbytes__,2,SHA512_DIGEST_STRING_LENGTH)));
! char *SHA512FileChunk(const char *, char *, off_t, off_t)
  	__attribute__((__bounded__(__minbytes__,2,SHA512_DIGEST_STRING_LENGTH)));
! char *SHA512Data(const u_int8_t *, size_t, char *)
  	__attribute__((__bounded__(__string__,1,2)))
  	__attribute__((__bounded__(__minbytes__,3,SHA512_DIGEST_STRING_LENGTH)));
  __END_DECLS