import fix to ITS#5172

[openldap] / include / lutil_md5.h

diff --git a/include/lutil_md5.h b/include/lutil_md5.h
index 4c6a37beeee06606c50439285de5ea6ac33510b1..eec1b17981517b60d81302c68c4c985026cbad0b 100644 (file)
--- a/include/lutil_md5.h
+++ b/include/lutil_md5.h
@@ -1,16 +1,18 @@
 /* $OpenLDAP$ */
-/*
- * Copyright 1998,1999 The OpenLDAP Foundation, Redwood City, California, USA
+/* 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>.
  */
 
-/* See md5.c for explanation and copyright information.  */
-
 #ifndef _LUTIL_MD5_H_
 #define _LUTIL_MD5_H_
 
@@ -24,37 +26,30 @@ LDAP_BEGIN_DECL
    important.  ANSI guarantees that "unsigned long" will be big enough,
    and always using it seems to have few disadvantages.  */
 
+#define LUTIL_MD5_BYTES 16
+
 struct lutil_MD5Context {
        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,
        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((
        ber_uint_t buf[4],
        const unsigned char in[64]));