ITS#8570 - Fix typo

[openldap] / include / lutil_hash.h

diff --git a/include/lutil_hash.h b/include/lutil_hash.h
index c382a7a6546500915d0dec1662ec6c88f6bd7afb..5149c37c62f4b807082f062f28a6f203b45330b9 100644 (file)
--- a/include/lutil_hash.h
+++ b/include/lutil_hash.h
@@ -1,16 +1,18 @@
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2000 The OpenLDAP Foundation, Redwood City, California, USA
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2017 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 hash.c for explanation and copyright information.  */
-
 #ifndef _LUTIL_HASH_H_
 #define _LUTIL_HASH_H_
 
@@ -20,26 +22,56 @@ LDAP_BEGIN_DECL
 
 #define LUTIL_HASH_BYTES 4
 
-struct lutil_HASHContext {
+#ifdef HAVE_LONG_LONG
+
+typedef union lutil_HASHContext {
        ber_uint_t hash;
-};
+       unsigned long long hash64;
+} lutil_HASH_CTX;
+
+#else /* !HAVE_LONG_LONG */
+
+typedef struct lutil_HASHContext {
+       ber_uint_t hash;
+} lutil_HASH_CTX;
+
+#endif /* HAVE_LONG_LONG */
 
 LDAP_LUTIL_F( void )
 lutil_HASHInit LDAP_P((
-       struct lutil_HASHContext *context));
+       lutil_HASH_CTX *context));
 
 LDAP_LUTIL_F( void )
 lutil_HASHUpdate LDAP_P((
-       struct lutil_HASHContext *context,
+       lutil_HASH_CTX *context,
        unsigned char const *buf,
        ber_len_t len));
 
 LDAP_LUTIL_F( void )
 lutil_HASHFinal LDAP_P((
        unsigned char digest[LUTIL_HASH_BYTES],
-       struct lutil_HASHContext *context));
+       lutil_HASH_CTX *context));
+
+#ifdef HAVE_LONG_LONG
+
+#define LUTIL_HASH64_BYTES     8
+
+LDAP_LUTIL_F( void )
+lutil_HASH64Init LDAP_P((
+       lutil_HASH_CTX *context));
+
+LDAP_LUTIL_F( void )
+lutil_HASH64Update LDAP_P((
+       lutil_HASH_CTX *context,
+       unsigned char const *buf,
+       ber_len_t len));
+
+LDAP_LUTIL_F( void )
+lutil_HASH64Final LDAP_P((
+       unsigned char digest[LUTIL_HASH64_BYTES],
+       lutil_HASH_CTX *context));
 
-typedef struct lutil_HASHContext lutil_HASH_CTX;
+#endif /* HAVE_LONG_LONG */
 
 LDAP_END_DECL