Unexpand spaces for tabs in prior commit before merging to rel_eng_1_1.

[openldap] / include / lutil_md5.h

diff --git a/include/lutil_md5.h b/include/lutil_md5.h
index e7d8b0682fd8b9569622ecd4e10007d937f34e3d..c0a9ba48bf7749ccba32c8674d59560aedadb09a 100644 (file)
--- a/include/lutil_md5.h
+++ b/include/lutil_md5.h
@@ -1,9 +1,10 @@
 /* See md5.c for explanation and copyright information.  */
 
-#ifndef _LDAP_MD5_H_
-#define _LDAP_MD5_H_
+#ifndef _LUTIL_MD5_H_
+#define _LUTIL_MD5_H_
 
 #include <ldap_cdefs.h>
+#include <ac/bytes.h>
 
 LDAP_BEGIN_DECL
 
@@ -14,37 +15,37 @@ LDAP_BEGIN_DECL
    and always using it seems to have few disadvantages.  */
 
 #ifndef LDAP_UINT32
-#define LDAP_UINT32
-typedef unsigned long uint32;
+#define LDAP_UINT32 1
+typedef LDAP_UINT4 uint32;
 #endif
 
-struct ldap_MD5Context {
+struct lutil_MD5Context {
        uint32 buf[4];
        uint32 bits[2];
        unsigned char in[64];
 };
 
-LDAP_F void ldap_MD5Init LDAP_P((
-       struct ldap_MD5Context *context));
+LDAP_F void lutil_MD5Init LDAP_P((
+       struct lutil_MD5Context *context));
 
-LDAP_F void ldap_MD5Update LDAP_P((
-       struct ldap_MD5Context *context,
+LDAP_F void lutil_MD5Update LDAP_P((
+       struct lutil_MD5Context *context,
        unsigned char const *buf,
        unsigned len));
 
-LDAP_F void ldap_MD5Final LDAP_P((
+LDAP_F void lutil_MD5Final LDAP_P((
        unsigned char digest[16],
-       struct ldap_MD5Context *context));
+       struct lutil_MD5Context *context));
 
-LDAP_F void ldap_MD5Transform LDAP_P((
+LDAP_F void lutil_MD5Transform LDAP_P((
        uint32 buf[4],
        const unsigned char in[64]));
 
 /*
  * This is needed to make RSAREF happy on some MS-DOS compilers.
  */
-typedef struct ldap_MD5Context ldap_MD5_CTX;
+typedef struct lutil_MD5Context lutil_MD5_CTX;
 
 LDAP_END_DECL
 
-#endif /* _LDAP_MD5_H_ */
+#endif /* _LUTIL_MD5_H_ */