Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-04 23:58:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/master' into topic/johanna/hash-unification

Browse source
This commit is contained in:
Johanna Amann 2020-05-06 16:11:07 -07:00
commit 04ed125941
257 changed files with 4534 additions and 4025 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/Hash.h
View file

@ -29,8 +29,9 @@ class BroString;
#include "ZeekArgs.h"
class Val;
class Frame;
class BifReturnVal;
namespace BifFunc {
extern Val* bro_md5_hmac(Frame* frame, const zeek::Args*);
extern BifReturnVal bro_md5_hmac(Frame* frame, const zeek::Args*);
}
typedef uint64_t hash_t;
@ -195,7 +196,7 @@ private:
inline static bool seeds_initialized = false;
friend void hmac_md5(size_t size, const unsigned char* bytes, unsigned char digest[16]);
friend Val* BifFunc::bro_md5_hmac(Frame* frame, const zeek::Args*);
friend BifReturnVal BifFunc::bro_md5_hmac(Frame* frame, const zeek::Args*);
};
typedef enum {