X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=include%2Flutil_sha1.h;h=cb3e67c2b1d16f0a5a60fc0c480282fbb80b8a37;hb=c4b4478799eeffe1dd89f73a2ce38f0fca38a571;hp=f4ed0a7538b9a1e085db576a1a3c0d5bc2275994;hpb=14df2c8ba27736d79893f138a3e85208fda6ecbc;p=openldap

diff --git a/include/lutil_sha1.h b/include/lutil_sha1.h
index f4ed0a7538..cb3e67c2b1 100644
--- a/include/lutil_sha1.h
+++ b/include/lutil_sha1.h
@@ -1,52 +1,68 @@
+/* $OpenLDAP$ */
+/*
+ * Copyright 1998-2000 The OpenLDAP Foundation, Redwood City, California, USA
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted only
+ * as authorized by the OpenLDAP Public License.  A copy of this
+ * license is available at http://www.OpenLDAP.org/license.html or
+ * in file LICENSE in the top-level directory of the distribution.
+ */
+
 /* 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
 
 /*
  * SHA-1 in C
  * By Steve Reid <steve@edmweb.com>
- * 100% Public Domain
  */
+#define LUTIL_SHA1_BYTES 20
 
-/* XXX   I wonder if this will work on 64bit architectures... */
-#ifndef LDAP_UINT32
-#define LDAP_UINT32
-typedef unsigned long uint32;
-#endif
+/* This code assumes char are 8-bits and uint32 are 32-bits */
+typedef ac_uint4 uint32;
 
 typedef struct {
     uint32 state[5];
     uint32 count[2];  
     unsigned char buffer[64];
-} ldap_SHA1_CTX;
+} lutil_SHA1_CTX;
   
-LDAP_F void ldap_SHA1Transform
+LIBLUTIL_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));
+LIBLUTIL_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));
+LIBLUTIL_F( void  )
+lutil_SHA1Update
+	LDAP_P((lutil_SHA1_CTX *context, const unsigned char *data, uint32 len));
 
-LDAP_F void ldap_SHA1Final
-	LDAP_P((unsigned char digest[20], ldap_SHA1_CTX *context));
+LIBLUTIL_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 *));
+LIBLUTIL_F( char * )
+lutil_SHA1End
+	LDAP_P((lutil_SHA1_CTX *, char *));
 
-LDAP_F char *ldap_SHA1File
+LIBLUTIL_F( char * )
+lutil_SHA1File
 	LDAP_P((char *, char *));
 
-LDAP_F char *ldap_SHA1Data
+LIBLUTIL_F( char * )
+lutil_SHA1Data
 	LDAP_P((const unsigned char *, size_t, char *));
 
 LDAP_END_DECL
 
-#endif _LDAP_SHA1_H_
+#endif /* _LUTIL_SHA1_H_ */