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/common/container.h | |
| parent | b3a69074933492080629d45b1c890606aa2bd08a (diff) | |
| parent | 1ad6dd0dbee7c757ef5f2f2d38b846ab7d991fb2 (diff) | |
| download | tor-35423d397f9d4f7810e538b608ded47c33311026.tar tor-35423d397f9d4f7810e538b608ded47c33311026.tar.gz | |
Merge branch 'bug4900_siphash_v2'
Diffstat (limited to 'src/common/container.h')
| -rw-r--r-- | src/common/container.h | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/src/common/container.h b/src/common/container.h index d6c80b808..93f0b7114 100644 --- a/src/common/container.h +++ b/src/common/container.h @@ -7,6 +7,7 @@ #define TOR_CONTAINER_H #include "util.h" +#include "siphash.h" /** A resizeable list of pointers, with associated helpful functionality. * @@ -620,11 +621,11 @@ typedef struct { static INLINE void digestset_add(digestset_t *set, const char *digest) { - const uint32_t *p = (const uint32_t *)digest; - const uint32_t d1 = p[0] + (p[1]>>16); - const uint32_t d2 = p[1] + (p[2]>>16); - const uint32_t d3 = p[2] + (p[3]>>16); - const uint32_t d4 = p[3] + (p[0]>>16); + const uint64_t x = siphash24g(digest, 20); + const uint32_t d1 = (uint32_t) x; + const uint32_t d2 = (uint32_t)( (x>>16) + x); + const uint32_t d3 = (uint32_t)( (x>>32) + x); + const uint32_t d4 = (uint32_t)( (x>>48) + x); bitarray_set(set->ba, BIT(d1)); bitarray_set(set->ba, BIT(d2)); bitarray_set(set->ba, BIT(d3)); @@ -636,11 +637,11 @@ digestset_add(digestset_t *set, const char *digest) static INLINE int digestset_contains(const digestset_t *set, const char *digest) { - const uint32_t *p = (const uint32_t *)digest; - const uint32_t d1 = p[0] + (p[1]>>16); - const uint32_t d2 = p[1] + (p[2]>>16); - const uint32_t d3 = p[2] + (p[3]>>16); - const uint32_t d4 = p[3] + (p[0]>>16); + const uint64_t x = siphash24g(digest, 20); + const uint32_t d1 = (uint32_t) x; + const uint32_t d2 = (uint32_t)( (x>>16) + x); + const uint32_t d3 = (uint32_t)( (x>>32) + x); + const uint32_t d4 = (uint32_t)( (x>>48) + x); return bitarray_is_set(set->ba, BIT(d1)) && bitarray_is_set(set->ba, BIT(d2)) && bitarray_is_set(set->ba, BIT(d3)) && |