Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 14:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Remove the -K/-J options for setting keys.

Browse source 
The options were never really used and do not seem especially useful;
initialization with a seed file still works.

This also fixes a bug with the initialization of the siphash key.
This commit is contained in:
Johanna Amann 2016-07-13 16:40:47 -07:00
parent 313647ce0e
commit 499ed5b566
6 changed files with 19 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/util.cc
View file

@ -791,13 +791,14 @@ void bro_srandom(unsigned int seed)
srandom(seed);
}
void init_random_seed(uint32 seed, const char* read_file, const char* write_file)
void init_random_seed(const char* read_file, const char* write_file)
{
static const int bufsiz = 20;
uint32 buf[bufsiz];
memset(buf, 0, sizeof(buf));
int pos = 0; // accumulates entropy
bool seeds_done = false;
uint32 seed = 0;
if ( read_file )
{
@ -870,7 +871,7 @@ void init_random_seed(uint32 seed, const char* read_file, const char* write_file
if ( ! siphash_key_set )
{
assert(sizeof(buf)-64 == 16);
memcpy(shared_siphash_key, buf+64, 16);
memcpy(shared_siphash_key, reinterpret_cast<const char*>(buf)+64, 16);
siphash_key_set = true;
}