X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Flutil_sha1.h;h=8b3d81ee9ddb893251571039a7009707cf6bb45e;hb=9697ad210a9e288c26dc3a62df87128ecc3a9f20;hp=b20d49030595630d5237efab2a751b1da27f97b5;hpb=af77c232f57dc70c472e10828ae121c4cda50e39;p=openldap

diff --git a/include/lutil_sha1.h b/include/lutil_sha1.h
index b20d490305..8b3d81ee9d 100644
--- a/include/lutil_sha1.h
+++ b/include/lutil_sha1.h
@@ -1,10 +1,11 @@
 /* This version is based on:
  *	$OpenBSD: sha1.h,v 1.8 1997/07/15 01:54:23 millert Exp $	*/
 
-#ifndef _LDAP_SHA1_H_
-#define _LDAP_SHA1_H_
+#ifndef _LUTIL_SHA1_H_
+#define _LUTIL_SHA1_H_
 
 #include <ldap_cdefs.h>
+#include <ac/bytes.h>
 
 LDAP_BEGIN_DECL
 
@@ -14,39 +15,38 @@ LDAP_BEGIN_DECL
  * 100% Public Domain
  */
 
-/* XXX   I wonder if this will work on 64bit architectures... */
 #ifndef LDAP_UINT32
-#define LDAP_UINT32
-typedef unsigned long uint32;
+#define LDAP_UINT32 1
+typedef LDAP_UINT4 uint32;
 #endif
 
 typedef struct {
     uint32 state[5];
     uint32 count[2];  
     unsigned char buffer[64];
-} ldap_SHA1_CTX;
+} lutil_SHA1_CTX;
   
-LDAP_F void ldap_SHA1Transform
+LDAP_F void lutil_SHA1Transform
 	LDAP_P((uint32 state[5], const unsigned char buffer[64]));
 
-LDAP_F void ldap_SHA1Init
-	LDAP_P((ldap_SHA1_CTX *context));
+LDAP_F void lutil_SHA1Init
+	LDAP_P((lutil_SHA1_CTX *context));
 
-LDAP_F void ldap_SHA1Update
-	LDAP_P((ldap_SHA1_CTX *context, const unsigned char *data, u_int len));
+LDAP_F void lutil_SHA1Update
+	LDAP_P((lutil_SHA1_CTX *context, const unsigned char *data, u_int len));
 
-LDAP_F void ldap_SHA1Final
-	LDAP_P((unsigned char digest[20], ldap_SHA1_CTX *context));
+LDAP_F void lutil_SHA1Final
+	LDAP_P((unsigned char digest[20], lutil_SHA1_CTX *context));
 
-LDAP_F char *ldap_SHA1End
-	LDAP_P((ldap_SHA1_CTX *, char *));
+LDAP_F char *lutil_SHA1End
+	LDAP_P((lutil_SHA1_CTX *, char *));
 
-LDAP_F char *ldap_SHA1File
+LDAP_F char *lutil_SHA1File
 	LDAP_P((char *, char *));
 
-LDAP_F char *ldap_SHA1Data
+LDAP_F char *lutil_SHA1Data
 	LDAP_P((const unsigned char *, size_t, char *));
 
 LDAP_END_DECL
 
-#endif /* _LDAP_SHA1_H_ */
+#endif /* _LUTIL_SHA1_H_ */