X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Flutil_md5.h;h=bb203897e26784b8a69bb91193523481ee415217;hb=6aab531d66ae25a2c594e7dfda2cdf2d5933c047;hp=1d06b74c82d8816fd2224ff33ea006c6a440781d;hpb=0991e22550247e142a5e10dee3c7e29dbb8af7e1;p=openldap

diff --git a/include/lutil_md5.h b/include/lutil_md5.h
index 1d06b74c82..bb203897e2 100644
--- a/include/lutil_md5.h
+++ b/include/lutil_md5.h
@@ -1,12 +1,13 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1998,1999 The OpenLDAP Foundation, Redwood City, California, USA
+ * Copyright 1998-2003 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.
  */
 
 /* See md5.c for explanation and copyright information.  */
@@ -14,55 +15,42 @@
 #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
-#define LDAP_UINT32 1
-typedef ac_uint4 uint32;
-#endif
+#define LUTIL_MD5_BYTES 16
 
 struct lutil_MD5Context {
-	uint32 buf[4];
-	uint32 bits[2];
+	ber_uint_t buf[4];
+	ber_uint_t bits[2];
 	unsigned char in[64];
 };
 
-#ifdef __MINGW32__
-#   undef LDAP_F_PRE
-#   ifdef LIBLUTIL_DECL
-#	define LDAP_F_PRE	extern __declspec(LIBLUTIL_DECL)
-#   else
-#	define LDAP_F_PRE	extern
-#   endif
-#endif
-
-LDAP_F( void )
+LDAP_LUTIL_F( void )
 lutil_MD5Init LDAP_P((
 	struct lutil_MD5Context *context));
 
-LDAP_F( void )
+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_LUTIL_F( void )
 lutil_MD5Final LDAP_P((
 	unsigned char digest[16],
 	struct lutil_MD5Context *context));
 
-LDAP_F( void )
+LDAP_LUTIL_F( void )
 lutil_MD5Transform LDAP_P((
-	uint32 buf[4],
+	ber_uint_t buf[4],
 	const unsigned char in[64]));
 
 /*