X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=include%2Flutil_sha1.h;h=f884ed30b526ad24c92a25820333a5b920c02f58;hb=06567ee554899031e6a83535a5e57b73a3c97ba6;hp=07f82fb8eb0af06d8e8dd78b38e5cdaea47d1d71;hpb=183a03cc2bf3c383b50dad3e4dd831ab3a32df6e;p=openldap

diff --git a/include/lutil_sha1.h b/include/lutil_sha1.h
index 07f82fb8eb..f884ed30b5 100644
--- a/include/lutil_sha1.h
+++ b/include/lutil_sha1.h
@@ -1,12 +1,13 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1998,1999 The OpenLDAP Foundation, Redwood City, California, USA
+ * Copyright 1998-2001 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.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, 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:
@@ -24,11 +25,10 @@ LDAP_BEGIN_DECL
  * SHA-1 in C
  * By Steve Reid <steve@edmweb.com>
  */
+#define LUTIL_SHA1_BYTES 20
 
-#ifndef LDAP_UINT32
-#define LDAP_UINT32 1
+/* This code assumes char are 8-bits and uint32 are 32-bits */
 typedef ac_uint4 uint32;
-#endif
 
 typedef struct {
     uint32 state[5];
@@ -36,31 +36,31 @@ typedef struct {
     unsigned char buffer[64];
 } lutil_SHA1_CTX;
   
-LDAP_F( void )
+LDAP_LUTIL_F( void )
 lutil_SHA1Transform
 	LDAP_P((uint32 state[5], const unsigned char buffer[64]));
 
-LDAP_F( void  )
+LDAP_LUTIL_F( void  )
 lutil_SHA1Init
 	LDAP_P((lutil_SHA1_CTX *context));
 
-LDAP_F( void  )
+LDAP_LUTIL_F( void  )
 lutil_SHA1Update
 	LDAP_P((lutil_SHA1_CTX *context, const unsigned char *data, uint32 len));
 
-LDAP_F( void  )
+LDAP_LUTIL_F( void  )
 lutil_SHA1Final
 	LDAP_P((unsigned char digest[20], lutil_SHA1_CTX *context));
 
-LDAP_F( char * )
+LDAP_LUTIL_F( char * )
 lutil_SHA1End
 	LDAP_P((lutil_SHA1_CTX *, char *));
 
-LDAP_F( char * )
+LDAP_LUTIL_F( char * )
 lutil_SHA1File
 	LDAP_P((char *, char *));
 
-LDAP_F( char * )
+LDAP_LUTIL_F( char * )
 lutil_SHA1Data
 	LDAP_P((const unsigned char *, size_t, char *));