X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Flutil_md5.h;h=990c0980fe4623c7092153269508a3e56d0ef0de;hb=b46547ada17b4585cc5c40150933be325bb1e9ac;hp=fb31443e9f60f2dfd4d6f7189f7af6d131f769b1;hpb=f05554bddccc234f39ad32c1891f120da26263c7;p=openldap

diff --git a/include/lutil_md5.h b/include/lutil_md5.h
index fb31443e9f..990c0980fe 100644
--- a/include/lutil_md5.h
+++ b/include/lutil_md5.h
@@ -1,50 +1,64 @@
-/* See md5.c for explanation and copyright information.  */
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2012 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>.
+ */
 
-#ifndef _LDAP_MD5_H_
-#define _LDAP_MD5_H_
+#ifndef _LUTIL_MD5_H_
+#define _LUTIL_MD5_H_
 
-#include <ldap_cdefs.h>
-#include <ac/bytes.h>
+#include <lber_types.h>
 
 LDAP_BEGIN_DECL
 
-/* Unlike previous versions of this code, uint32 need not be exactly
+/* Unlike previous versions of this code, ber_int_t need not be exactly
    32 bits, merely 32 bits or more.  Choosing a data type which is 32
    bits instead of 64 is not important; speed is considerably more
    important.  ANSI guarantees that "unsigned long" will be big enough,
    and always using it seems to have few disadvantages.  */
 
-#ifndef LDAP_UINT32
-typedef LDAP_UINT4 uint32;
-#endif
+#define LUTIL_MD5_BYTES 16
 
-struct ldap_MD5Context {
-	uint32 buf[4];
-	uint32 bits[2];
+struct lutil_MD5Context {
+	ber_uint_t buf[4];
+	ber_uint_t bits[2];
 	unsigned char in[64];
 };
 
-LDAP_F void ldap_MD5Init LDAP_P((
-	struct ldap_MD5Context *context));
+LDAP_LUTIL_F( void )
+lutil_MD5Init LDAP_P((
+	struct lutil_MD5Context *context));
 
-LDAP_F void ldap_MD5Update LDAP_P((
-	struct ldap_MD5Context *context,
+LDAP_LUTIL_F( void )
+lutil_MD5Update LDAP_P((
+	struct lutil_MD5Context *context,
 	unsigned char const *buf,
-	unsigned len));
+	ber_len_t len));
 
-LDAP_F void ldap_MD5Final LDAP_P((
+LDAP_LUTIL_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((
-	uint32 buf[4],
+LDAP_LUTIL_F( void )
+lutil_MD5Transform LDAP_P((
+	ber_uint_t 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_ */