More for ITS#5262, -q fixes from HEAD

[openldap] / include / lutil_sha1.h

diff --git a/include/lutil_sha1.h b/include/lutil_sha1.h
index cdcabf4e415c6cbfcd68696a94d4158f92b7f6a3..57a1369024e5b51a33a788e67257116d90c3f88e 100644 (file)
--- a/include/lutil_sha1.h
+++ b/include/lutil_sha1.h
@@ -1,11 +1,16 @@
-/*
- * Copyright 1998,1999 The OpenLDAP Foundation, Redwood City, California, USA
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2007 The OpenLDAP Foundation.
  * 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 in file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 /* This version is based on:
@@ -17,46 +22,56 @@
 #include <ldap_cdefs.h>
 #include <ac/bytes.h>
 
+#ifdef AC_INT4_TYPE
+
 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];
-    uint32 count[2];  
+    uint32 count[2];
     unsigned char buffer[64];
 } lutil_SHA1_CTX;
-  
-LDAP_F void lutil_SHA1Transform
+
+LDAP_LUTIL_F( void )
+lutil_SHA1Transform
        LDAP_P((uint32 state[5], const unsigned char buffer[64]));
 
-LDAP_F void lutil_SHA1Init
+LDAP_LUTIL_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));
+LDAP_LUTIL_F( void  )
+lutil_SHA1Update
+       LDAP_P((lutil_SHA1_CTX *context, const unsigned char *data, uint32 len));
 
-LDAP_F void lutil_SHA1Final
+LDAP_LUTIL_F( void  )
+lutil_SHA1Final
        LDAP_P((unsigned char digest[20], lutil_SHA1_CTX *context));
 
-LDAP_F char *lutil_SHA1End
+LDAP_LUTIL_F( char * )
+lutil_SHA1End
        LDAP_P((lutil_SHA1_CTX *, char *));
 
-LDAP_F char *lutil_SHA1File
+LDAP_LUTIL_F( char * )
+lutil_SHA1File
        LDAP_P((char *, char *));
 
-LDAP_F char *lutil_SHA1Data
+LDAP_LUTIL_F( char * )
+lutil_SHA1Data
        LDAP_P((const unsigned char *, size_t, char *));
 
 LDAP_END_DECL
 
+#endif /* AC_INT4_TYPE */
+
 #endif /* _LUTIL_SHA1_H_ */