Fix prev commit

[openldap] / include / lutil_sha1.h

diff --git a/include/lutil_sha1.h b/include/lutil_sha1.h
index b20d49030595630d5237efab2a751b1da27f97b5..a3dc73c571d3a3e097adf130b595d9f02fbb9909 100644 (file)
--- a/include/lutil_sha1.h
+++ b/include/lutil_sha1.h
@@ -1,52 +1,77 @@
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2008 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * 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:
  *     $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>
+
+#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
 
-/* 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];  
+    uint32 count[2];
     unsigned char buffer[64];
-} ldap_SHA1_CTX;
-  
-LDAP_F void ldap_SHA1Transform
+} lutil_SHA1_CTX;
+
+LDAP_LUTIL_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_LUTIL_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_LUTIL_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));
+LDAP_LUTIL_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_LUTIL_F( char * )
+lutil_SHA1End
+       LDAP_P((lutil_SHA1_CTX *, char *));
 
-LDAP_F char *ldap_SHA1File
+LDAP_LUTIL_F( char * )
+lutil_SHA1File
        LDAP_P((char *, char *));
 
-LDAP_F char *ldap_SHA1Data
+LDAP_LUTIL_F( char * )
+lutil_SHA1Data
        LDAP_P((const unsigned char *, size_t, char *));
 
 LDAP_END_DECL
 
-#endif /* _LDAP_SHA1_H_ */
+#endif /* AC_INT4_TYPE */
+
+#endif /* _LUTIL_SHA1_H_ */