mirror of
https://github.com/zeek/zeek.git
synced 2025-10-04 15:48:19 +00:00
Merge remote-tracking branch 'origin/master' into topic/robin/dataseries
This commit is contained in:
commit
be6567f437
149 changed files with 2607 additions and 1126 deletions
|
@ -18,6 +18,8 @@ extern "C" {
|
|||
}
|
||||
#endif
|
||||
|
||||
#include <openssl/md5.h>
|
||||
|
||||
extern "C" void OPENSSL_add_all_algorithms_conf(void);
|
||||
|
||||
#include "bsd-getopt-long.h"
|
||||
|
@ -591,8 +593,7 @@ int main(int argc, char** argv)
|
|||
break;
|
||||
|
||||
case 'K':
|
||||
hash_md5(strlen(optarg), (const u_char*) optarg,
|
||||
shared_hmac_md5_key);
|
||||
MD5((const u_char*) optarg, strlen(optarg), shared_hmac_md5_key);
|
||||
hmac_key_set = 1;
|
||||
break;
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue