X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Flutil_sha1.h;h=cb3e67c2b1d16f0a5a60fc0c480282fbb80b8a37;hb=9c00cb1b51acec0fef493f1dc91a9b7d61f7ac53;hp=8b3d81ee9ddb893251571039a7009707cf6bb45e;hpb=c1cef27bda78a361d110bd20b83145b62d01ba25;p=openldap

diff --git a/include/lutil_sha1.h b/include/lutil_sha1.h
index 8b3d81ee9d..cb3e67c2b1 100644
--- a/include/lutil_sha1.h
+++ b/include/lutil_sha1.h
@@ -1,3 +1,14 @@
+/* $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 $	*/
 
@@ -12,13 +23,11 @@ LDAP_BEGIN_DECL
 /*
  * SHA-1 in C
  * By Steve Reid <steve@edmweb.com>
- * 100% Public Domain
  */
+#define LUTIL_SHA1_BYTES 20
 
-#ifndef LDAP_UINT32
-#define LDAP_UINT32 1
-typedef LDAP_UINT4 uint32;
-#endif
+/* This code assumes char are 8-bits and uint32 are 32-bits */
+typedef ac_uint4 uint32;
 
 typedef struct {
     uint32 state[5];
@@ -26,25 +35,32 @@ typedef struct {
     unsigned char buffer[64];
 } lutil_SHA1_CTX;
   
-LDAP_F void lutil_SHA1Transform
+LIBLUTIL_F( void )
+lutil_SHA1Transform
 	LDAP_P((uint32 state[5], const unsigned char buffer[64]));
 
-LDAP_F void lutil_SHA1Init
+LIBLUTIL_F( void  )
+lutil_SHA1Init
 	LDAP_P((lutil_SHA1_CTX *context));
 
-LDAP_F void lutil_SHA1Update
-	LDAP_P((lutil_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 lutil_SHA1Final
+LIBLUTIL_F( void  )
+lutil_SHA1Final
 	LDAP_P((unsigned char digest[20], lutil_SHA1_CTX *context));
 
-LDAP_F char *lutil_SHA1End
+LIBLUTIL_F( char * )
+lutil_SHA1End
 	LDAP_P((lutil_SHA1_CTX *, char *));
 
-LDAP_F char *lutil_SHA1File
+LIBLUTIL_F( char * )
+lutil_SHA1File
 	LDAP_P((char *, char *));
 
-LDAP_F char *lutil_SHA1Data
+LIBLUTIL_F( char * )
+lutil_SHA1Data
 	LDAP_P((const unsigned char *, size_t, char *));
 
 LDAP_END_DECL