Do not require ac/string.h for lber_pvt.h

[openldap] / include / lutil_hash.h

diff --git a/include/lutil_hash.h b/include/lutil_hash.h
index c38e748c29d5af979ccb49dec9bed4d0c96cbe28..9b344bacaea83c94d21d096448474f8fb32fa82a 100644 (file)
--- a/include/lutil_hash.h
+++ b/include/lutil_hash.h
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2012 The OpenLDAP Foundation.
+ * Copyright 1998-2018 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -22,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