mirror of
https://github.com/zeek/zeek.git
synced 2025-10-02 14:48:21 +00:00
Reformat the world
This commit is contained in:
Tim Wojtulewicz
parent
194cb24547
commit
b2f171ec69
714 changed files with 35149 additions and 35203 deletions
94
src/Hash.cc
94
src/Hash.cc
|
|
@ -1,45 +1,56 @@
|
|||
// See the file "COPYING" in the main distribution directory for copyright.
|
||||
|
||||
#include "zeek/zeek-config.h"
|
||||
#include "zeek/Hash.h"
|
||||
|
||||
#include <highwayhash/sip_hash.h>
|
||||
#include <highwayhash/highwayhash_target.h>
|
||||
#include <highwayhash/instruction_sets.h>
|
||||
#include <highwayhash/sip_hash.h>
|
||||
|
||||
#include "zeek/digest.h"
|
||||
#include "zeek/Reporter.h"
|
||||
#include "zeek/ZeekString.h"
|
||||
#include "zeek/Val.h" // needed for const.bif
|
||||
#include "zeek/ZeekString.h"
|
||||
#include "zeek/digest.h"
|
||||
#include "zeek/zeek-config.h"
|
||||
|
||||
#include "const.bif.netvar_h"
|
||||
|
||||
namespace zeek::detail {
|
||||
namespace zeek::detail
|
||||
{
|
||||
|
||||
alignas(32) uint64_t KeyedHash::shared_highwayhash_key[4];
|
||||
alignas(32) uint64_t KeyedHash::cluster_highwayhash_key[4];
|
||||
alignas(16) unsigned long long KeyedHash::shared_siphash_key[2];
|
||||
|
||||
// we use the following lines to not pull in the highwayhash headers in Hash.h - but to check the types did not change underneath us.
|
||||
static_assert(std::is_same<hash64_t, highwayhash::HHResult64>::value, "Highwayhash return values must match hash_x_t");
|
||||
static_assert(std::is_same<hash128_t, highwayhash::HHResult128>::value, "Highwayhash return values must match hash_x_t");
|
||||
static_assert(std::is_same<hash256_t, highwayhash::HHResult256>::value, "Highwayhash return values must match hash_x_t");
|
||||
// we use the following lines to not pull in the highwayhash headers in Hash.h - but to check the
|
||||
// types did not change underneath us.
|
||||
static_assert(std::is_same<hash64_t, highwayhash::HHResult64>::value,
|
||||
"Highwayhash return values must match hash_x_t");
|
||||
static_assert(std::is_same<hash128_t, highwayhash::HHResult128>::value,
|
||||
"Highwayhash return values must match hash_x_t");
|
||||
static_assert(std::is_same<hash256_t, highwayhash::HHResult256>::value,
|
||||
"Highwayhash return values must match hash_x_t");
|
||||
|
||||
void KeyedHash::InitializeSeeds(const std::array<uint32_t, SEED_INIT_SIZE>& seed_data)
|
||||
{
|
||||
static_assert(std::is_same<decltype(KeyedHash::shared_siphash_key), highwayhash::SipHashState::Key>::value, "Highwayhash Key is not unsigned long long[2]");
|
||||
static_assert(std::is_same<decltype(KeyedHash::shared_highwayhash_key), highwayhash::HHKey>::value, "Highwayhash HHKey is not uint64_t[4]");
|
||||
static_assert(std::is_same<decltype(KeyedHash::shared_siphash_key),
|
||||
highwayhash::SipHashState::Key>::value,
|
||||
"Highwayhash Key is not unsigned long long[2]");
|
||||
static_assert(
|
||||
std::is_same<decltype(KeyedHash::shared_highwayhash_key), highwayhash::HHKey>::value,
|
||||
"Highwayhash HHKey is not uint64_t[4]");
|
||||
if ( seeds_initialized )
|
||||
return;
|
||||
|
||||
// leaving this at being generated by md5, allowing user scripts that use hmac_md5 functionality
|
||||
// to get the same hash values as before. For now.
|
||||
internal_md5((const u_char*) seed_data.data(), sizeof(seed_data) - 16, shared_hmac_md5_key); // The last 128 bits of buf are for siphash
|
||||
// yes, we use the same buffer twice to initialize two different keys. This should not really be a
|
||||
// security problem of any kind: hmac-md5 is not really used anymore - and even if it was, the hashes
|
||||
// should not reveal any information about their initialization vector.
|
||||
internal_md5((const u_char*)seed_data.data(), sizeof(seed_data) - 16,
|
||||
shared_hmac_md5_key); // The last 128 bits of buf are for siphash
|
||||
// yes, we use the same buffer twice to initialize two different keys. This should not really be
|
||||
// a security problem of any kind: hmac-md5 is not really used anymore - and even if it was, the
|
||||
// hashes should not reveal any information about their initialization vector.
|
||||
static_assert(sizeof(shared_highwayhash_key) == SHA256_DIGEST_LENGTH);
|
||||
calculate_digest(Hash_SHA256, (const u_char*) seed_data.data(), sizeof(seed_data) - 16, reinterpret_cast<unsigned char*>(shared_highwayhash_key));
|
||||
calculate_digest(Hash_SHA256, (const u_char*)seed_data.data(), sizeof(seed_data) - 16,
|
||||
reinterpret_cast<unsigned char*>(shared_highwayhash_key));
|
||||
memcpy(shared_siphash_key, reinterpret_cast<const char*>(seed_data.data()) + 64, 16);
|
||||
|
||||
seeds_initialized = true;
|
||||
|
|
@ -47,39 +58,45 @@ void KeyedHash::InitializeSeeds(const std::array<uint32_t, SEED_INIT_SIZE>& seed
|
|||
|
||||
void KeyedHash::InitOptions()
|
||||
{
|
||||
calculate_digest(Hash_SHA256, BifConst::digest_salt->Bytes(), BifConst::digest_salt->Len(), reinterpret_cast<unsigned char*>(cluster_highwayhash_key));
|
||||
calculate_digest(Hash_SHA256, BifConst::digest_salt->Bytes(), BifConst::digest_salt->Len(),
|
||||
reinterpret_cast<unsigned char*>(cluster_highwayhash_key));
|
||||
}
|
||||
|
||||
hash64_t KeyedHash::Hash64(const void* bytes, uint64_t size)
|
||||
{
|
||||
return highwayhash::SipHash(shared_siphash_key, reinterpret_cast<const char *>(bytes), size);
|
||||
return highwayhash::SipHash(shared_siphash_key, reinterpret_cast<const char*>(bytes), size);
|
||||
}
|
||||
|
||||
void KeyedHash::Hash128(const void* bytes, uint64_t size, hash128_t* result)
|
||||
{
|
||||
highwayhash::InstructionSets::Run<highwayhash::HighwayHash>(shared_highwayhash_key, reinterpret_cast<const char *>(bytes), size, result);
|
||||
highwayhash::InstructionSets::Run<highwayhash::HighwayHash>(
|
||||
shared_highwayhash_key, reinterpret_cast<const char*>(bytes), size, result);
|
||||
}
|
||||
|
||||
void KeyedHash::Hash256(const void* bytes, uint64_t size, hash256_t* result)
|
||||
{
|
||||
highwayhash::InstructionSets::Run<highwayhash::HighwayHash>(shared_highwayhash_key, reinterpret_cast<const char *>(bytes), size, result);
|
||||
highwayhash::InstructionSets::Run<highwayhash::HighwayHash>(
|
||||
shared_highwayhash_key, reinterpret_cast<const char*>(bytes), size, result);
|
||||
}
|
||||
|
||||
hash64_t KeyedHash::StaticHash64(const void* bytes, uint64_t size)
|
||||
{
|
||||
hash64_t result = 0;
|
||||
highwayhash::InstructionSets::Run<highwayhash::HighwayHash>(cluster_highwayhash_key, reinterpret_cast<const char *>(bytes), size, &result);
|
||||
highwayhash::InstructionSets::Run<highwayhash::HighwayHash>(
|
||||
cluster_highwayhash_key, reinterpret_cast<const char*>(bytes), size, &result);
|
||||
return result;
|
||||
}
|
||||
|
||||
void KeyedHash::StaticHash128(const void* bytes, uint64_t size, hash128_t* result)
|
||||
{
|
||||
highwayhash::InstructionSets::Run<highwayhash::HighwayHash>(cluster_highwayhash_key, reinterpret_cast<const char *>(bytes), size, result);
|
||||
highwayhash::InstructionSets::Run<highwayhash::HighwayHash>(
|
||||
cluster_highwayhash_key, reinterpret_cast<const char*>(bytes), size, result);
|
||||
}
|
||||
|
||||
void KeyedHash::StaticHash256(const void* bytes, uint64_t size, hash256_t* result)
|
||||
{
|
||||
highwayhash::InstructionSets::Run<highwayhash::HighwayHash>(cluster_highwayhash_key, reinterpret_cast<const char *>(bytes), size, result);
|
||||
highwayhash::InstructionSets::Run<highwayhash::HighwayHash>(
|
||||
cluster_highwayhash_key, reinterpret_cast<const char*>(bytes), size, result);
|
||||
}
|
||||
|
||||
void init_hash_function()
|
||||
|
|
@ -92,7 +109,7 @@ void init_hash_function()
|
|||
HashKey::HashKey(bro_int_t i)
|
||||
{
|
||||
key_u.i = i;
|
||||
key = (void*) &key_u;
|
||||
key = (void*)&key_u;
|
||||
size = sizeof(i);
|
||||
hash = HashBytes(key, size);
|
||||
}
|
||||
|
|
@ -100,7 +117,7 @@ HashKey::HashKey(bro_int_t i)
|
|||
HashKey::HashKey(bro_uint_t u)
|
||||
{
|
||||
key_u.i = bro_int_t(u);
|
||||
key = (void*) &key_u;
|
||||
key = (void*)&key_u;
|
||||
size = sizeof(u);
|
||||
hash = HashBytes(key, size);
|
||||
}
|
||||
|
|
@ -108,7 +125,7 @@ HashKey::HashKey(bro_uint_t u)
|
|||
HashKey::HashKey(uint32_t u)
|
||||
{
|
||||
key_u.u32 = u;
|
||||
key = (void*) &key_u;
|
||||
key = (void*)&key_u;
|
||||
size = sizeof(u);
|
||||
hash = HashBytes(key, size);
|
||||
}
|
||||
|
|
@ -116,19 +133,19 @@ HashKey::HashKey(uint32_t u)
|
|||
HashKey::HashKey(const uint32_t u[], int n)
|
||||
{
|
||||
size = n * sizeof(u[0]);
|
||||
key = (void*) u;
|
||||
key = (void*)u;
|
||||
hash = HashBytes(key, size);
|
||||
}
|
||||
|
||||
HashKey::HashKey(double d)
|
||||
{
|
||||
union {
|
||||
union {
|
||||
double d;
|
||||
int i[2];
|
||||
} u;
|
||||
} u;
|
||||
|
||||
key_u.d = u.d = d;
|
||||
key = (void*) &key_u;
|
||||
key = (void*)&key_u;
|
||||
size = sizeof(d);
|
||||
hash = HashBytes(key, size);
|
||||
}
|
||||
|
|
@ -136,22 +153,22 @@ HashKey::HashKey(double d)
|
|||
HashKey::HashKey(const void* p)
|
||||
{
|
||||
key_u.p = p;
|
||||
key = (void*) &key_u;
|
||||
key = (void*)&key_u;
|
||||
size = sizeof(p);
|
||||
hash = HashBytes(key, size);
|
||||
}
|
||||
|
||||
HashKey::HashKey(const char* s)
|
||||
{
|
||||
size = strlen(s); // note - skip final \0
|
||||
key = (void*) s;
|
||||
size = strlen(s); // note - skip final \0
|
||||
key = (void*)s;
|
||||
hash = HashBytes(key, size);
|
||||
}
|
||||
|
||||
HashKey::HashKey(const String* s)
|
||||
{
|
||||
size = s->Len();
|
||||
key = (void*) s->Bytes();
|
||||
key = (void*)s->Bytes();
|
||||
hash = HashBytes(key, size);
|
||||
}
|
||||
|
||||
|
|
@ -162,7 +179,7 @@ HashKey::HashKey(int copy_key, void* arg_key, int arg_size)
|
|||
|
||||
if ( copy_key )
|
||||
{
|
||||
key = (void*) new char[size];
|
||||
key = (void*)new char[size];
|
||||
memcpy(key, arg_key, size);
|
||||
}
|
||||
else
|
||||
|
|
@ -179,8 +196,7 @@ HashKey::HashKey(const void* arg_key, int arg_size, hash_t arg_hash)
|
|||
is_our_dynamic = true;
|
||||
}
|
||||
|
||||
HashKey::HashKey(const void* arg_key, int arg_size, hash_t arg_hash,
|
||||
bool /* dont_copy */)
|
||||
HashKey::HashKey(const void* arg_key, int arg_size, hash_t arg_hash, bool /* dont_copy */)
|
||||
{
|
||||
size = arg_size;
|
||||
hash = arg_hash;
|
||||
|
|
@ -208,7 +224,7 @@ void* HashKey::TakeKey()
|
|||
|
||||
void* HashKey::CopyKey(const void* k, int s) const
|
||||
{
|
||||
void* k_copy = (void*) new char[s];
|
||||
void* k_copy = (void*)new char[s];
|
||||
memcpy(k_copy, k, s);
|
||||
return k_copy;
|
||||
}
|
||||
|
|
@ -218,4 +234,4 @@ hash_t HashKey::HashBytes(const void* bytes, int size)
|
|||
return KeyedHash::Hash64(bytes, size);
|
||||
}
|
||||
|
||||
} // namespace zeek::detail
|
||||
} // namespace zeek::detail
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue