Merge branch 'master' of https://github.com/rbclark/bro into topic/johanna/md5-fips

* 'master' of https://github.com/rbclark/bro:
  Tell OpenSSL that MD5 is not used for security in order to allow bro to work properly on a FIPS system
This commit is contained in:
Johanna Amann 2019-01-18 15:34:06 -08:00
commit ffa6756255
10 changed files with 97 additions and 47 deletions

View file

@ -10,6 +10,7 @@
#include "Var.h"
#include "Event.h"
#include "UID.h"
#include "digest.h"
#include "plugin/Manager.h"
#include "analyzer/Manager.h"
@ -93,7 +94,7 @@ string Manager::HashHandle(const string& handle) const
uint64 hash[2];
string msg(handle + salt);
MD5(reinterpret_cast<const u_char*>(msg.data()), msg.size(),
internal_md5(reinterpret_cast<const u_char*>(msg.data()), msg.size(),
reinterpret_cast<u_char*>(hash));
return Bro::UID(bits_per_uid, hash, 2).Base62("F");