kris/boringssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use OPENSSL_hash32 in lh_strhash.

Browse Source 
No need to have two of these.

Change-Id: I5ff1ba24757828d8113321cd3262fed3d4defcdb
Reviewed-on: https://boringssl-review.googlesource.com/19525
Commit-Queue: Adam Langley <agl@google.com>
Reviewed-by: Adam Langley <agl@google.com>
CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
This commit is contained in:
David Benjamin 2017-08-19 13:26:08 -04:00 committed by CQ bot account: commit-bot@chromium.org
parent 7cc3f4fce0
commit e7848220a2
1 changed files with 3 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
crypto/lhash/lhash.c
View File

@ -309,28 +309,9 @@ void lh_doall_arg(_LHASH *lh, void (*func)(void *, void *), void *arg) {
}
uint32_t lh_strhash(const char *c) {
// The following hash seems to work very well on normal text strings
// no collisions on /usr/dict/words and it distributes on %2^n quite
// well, not as good as MD5, but still good.
unsigned long ret = 0;
long n;
unsigned long v;
int r;
if ((c == NULL) || (*c == '\0')) {
return (ret);
if (c == NULL) {
return 0;
}
n = 0x100;
while (*c) {
v = n | (*c);
n += 0x100;
r = (int)((v >> 2) ^ v) & 0x0f;
ret = (ret << r) | (ret >> (32 - r));
ret &= 0xFFFFFFFFL;
ret ^= v * v;
c++;
}
return ((ret >> 16) ^ ret);
return OPENSSL_hash32(c, strlen(c));
}