diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-02-15 15:59:10 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-02-15 15:59:10 -0500 |
| commit | 35423d397f9d4f7810e538b608ded47c33311026 (patch) | |
| tree | 61acc3efaad82b92b1752568a03a296738bf03fb /src/or/fp_pair.c | |
| parent | b3a69074933492080629d45b1c890606aa2bd08a (diff) | |
| parent | 1ad6dd0dbee7c757ef5f2f2d38b846ab7d991fb2 (diff) | |
| download | tor-35423d397f9d4f7810e538b608ded47c33311026.tar tor-35423d397f9d4f7810e538b608ded47c33311026.tar.gz | |
Merge branch 'bug4900_siphash_v2'
Diffstat (limited to 'src/or/fp_pair.c')
| -rw-r--r-- | src/or/fp_pair.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/src/or/fp_pair.c b/src/or/fp_pair.c index 4d8a835c8..55e4c89a4 100644 --- a/src/or/fp_pair.c +++ b/src/or/fp_pair.c @@ -32,17 +32,8 @@ fp_pair_map_entries_eq(const fp_pair_map_entry_t *a, static INLINE unsigned int fp_pair_map_entry_hash(const fp_pair_map_entry_t *a) { - const uint32_t *p; - unsigned int hash; - - p = (const uint32_t *)(a->key.first); - /* Hashes are 20 bytes long, so 5 times uint32_t */ - hash = p[0] ^ p[1] ^ p[2] ^ p[3] ^ p[4]; - /* Now XOR in the second fingerprint */ - p = (const uint32_t *)(a->key.second); - hash ^= p[0] ^ p[1] ^ p[2] ^ p[3] ^ p[4]; - - return hash; + tor_assert(sizeof(a->key) == DIGEST_LEN*2); + return (unsigned) siphash24g(&a->key, DIGEST_LEN*2); } /* |