From: Howard Chu <hyc@openldap.org>
Date: Tue, 28 Sep 2004 04:13:09 +0000 (+0000)
Subject: Tweak exact hashing in prev commit
X-Git-Tag: OPENLDAP_REL_ENG_2_3_0ALPHA~488
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=fc44ed4593bd0c4eaf48b6691415ee6d4e5ce1fa;p=openldap

Tweak exact hashing in prev commit
---

diff --git a/servers/slapd/schema_init.c b/servers/slapd/schema_init.c
index cb2e88b800..d107ddad84 100644
--- a/servers/slapd/schema_init.c
+++ b/servers/slapd/schema_init.c
@@ -208,22 +208,9 @@ int octetStringIndexer(
 	slen = syntax->ssyn_oidlen;
 	mlen = mr->smr_oidlen;
 
-	/* XXX this invocation does not like hashDigestify() */
 	for( i=0; values[i].bv_val != NULL; i++ ) {
-		HASH_Init( &HASHcontext );
-		if( prefix != NULL && prefix->bv_len > 0 ) {
-			HASH_Update( &HASHcontext,
-				(unsigned char *)prefix->bv_val,
-				prefix->bv_len );
-		}
-		HASH_Update( &HASHcontext,
-			(unsigned char *)syntax->ssyn_oid, slen );
-		HASH_Update( &HASHcontext,
-			(unsigned char *)mr->smr_oid, mlen );
-		HASH_Update( &HASHcontext,
-			(unsigned char *)values[i].bv_val, values[i].bv_len );
-		HASH_Final( HASHdigest, &HASHcontext );
-
+		hashDigestify( &HASHcontext, HASHdigest, prefix, 0,
+			syntax, mr, (unsigned char *)values[i].bv_val, values[i].bv_len );
 		ber_dupbv_x( &keys[i], &digest, ctx );
 	}
 
@@ -260,18 +247,8 @@ int octetStringFilter(
 
 	keys = slap_sl_malloc( sizeof( struct berval ) * 2, ctx );
 
-	HASH_Init( &HASHcontext );
-	if( prefix != NULL && prefix->bv_len > 0 ) {
-		HASH_Update( &HASHcontext,
-			(unsigned char *)prefix->bv_val, prefix->bv_len );
-	}
-	HASH_Update( &HASHcontext,
-		(unsigned char *)syntax->ssyn_oid, slen );
-	HASH_Update( &HASHcontext,
-		(unsigned char *)mr->smr_oid, mlen );
-	HASH_Update( &HASHcontext,
-		(unsigned char *)value->bv_val, value->bv_len );
-	HASH_Final( HASHdigest, &HASHcontext );
+	hashDigestify( &HASHcontext, HASHdigest, prefix, 0,
+		syntax, mr, (unsigned char *)value->bv_val, value->bv_len );
 
 	ber_dupbv_x( keys, &digest, ctx );
 	keys[1].bv_val = NULL;