===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/include/sha1.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -c -r1.10 -r1.11
*** src/include/sha1.h	2002/02/16 21:27:17	1.10
--- src/include/sha1.h	2002/12/23 04:33:31	1.11
***************
*** 1,4 ****
! /*	$OpenBSD: sha1.h,v 1.10 2002/02/16 21:27:17 millert Exp $	*/
  
  /*
   * SHA-1 in C
--- 1,4 ----
! /*	$OpenBSD: sha1.h,v 1.11 2002/12/23 04:33:31 millert Exp $	*/
  
  /*
   * SHA-1 in C
***************
*** 11,20 ****
  
  typedef struct {
      u_int32_t state[5];
!     u_int32_t count[2];  
      u_char buffer[64];
  } SHA1_CTX;
!   
  void SHA1Transform(u_int32_t state[5], const u_char buffer[64]);
  void SHA1Init(SHA1_CTX *context);
  void SHA1Update(SHA1_CTX *context, const u_char *data, u_int len);
--- 11,23 ----
  
  typedef struct {
      u_int32_t state[5];
!     u_int32_t count[2];
      u_char buffer[64];
  } SHA1_CTX;
! 
! #include <sys/cdefs.h>
! 
! __BEGIN_DECLS
  void SHA1Transform(u_int32_t state[5], const u_char buffer[64]);
  void SHA1Init(SHA1_CTX *context);
  void SHA1Update(SHA1_CTX *context, const u_char *data, u_int len);
***************
*** 22,42 ****
  char *SHA1End(SHA1_CTX *, char *);
  char *SHA1File(char *, char *);
  char *SHA1Data(const u_char *, size_t, char *);
  
  #define SHA1_DIGESTSIZE       20
  #define SHA1_BLOCKSIZE        64
! #define HTONDIGEST(x) { \
!       x[0] = htonl(x[0]); \
!       x[1] = htonl(x[1]); \
!       x[2] = htonl(x[2]); \
!       x[3] = htonl(x[3]); \
!       x[4] = htonl(x[4]); }
  
! #define NTOHDIGEST(x) { \
!       x[0] = ntohl(x[0]); \
!       x[1] = ntohl(x[1]); \
!       x[2] = ntohl(x[2]); \
!       x[3] = ntohl(x[3]); \
!       x[4] = ntohl(x[4]); }
  
  #endif /* _SHA1_H */
--- 25,46 ----
  char *SHA1End(SHA1_CTX *, char *);
  char *SHA1File(char *, char *);
  char *SHA1Data(const u_char *, size_t, char *);
+ __END_DECLS
  
  #define SHA1_DIGESTSIZE       20
  #define SHA1_BLOCKSIZE        64
! #define HTONDIGEST(x) do {                                              \
!         x[0] = htonl(x[0]);                                             \
!         x[1] = htonl(x[1]);                                             \
!         x[2] = htonl(x[2]);                                             \
!         x[3] = htonl(x[3]);                                             \
!         x[4] = htonl(x[4]); } while (0)
  
! #define NTOHDIGEST(x) do {                                              \
!         x[0] = ntohl(x[0]);                                             \
!         x[1] = ntohl(x[1]);                                             \
!         x[2] = ntohl(x[2]);                                             \
!         x[3] = ntohl(x[3]);                                             \
!         x[4] = ntohl(x[4]); } while (0)
  
  #endif /* _SHA1_H */