Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-05 16:18:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'origin/topic/jsiwek/file-analysis' into topic/seth/file-analysis-exe-analyzer

Browse source 
Conflicts:
	src/file_analysis/ActionSet.cc
This commit is contained in:
Seth Hall 2013-04-03 10:56:38 -04:00
commit a624dd61c0
27 changed files with 80205 additions and 159553 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/file_analysis/ActionSet.cc
View file

@ -11,13 +11,11 @@ using namespace file_analysis;
// keep in order w/ declared enum values in file_analysis.bif
static ActionInstantiator action_factory[] = {
Extract::Instantiate,
MD5::Instantiate,
SHA1::Instantiate,
SHA256::Instantiate,
DataEvent::Instantiate,
PE_Analyzer::Instantiate,
file_analysis::Extract::Instantiate,
file_analysis::MD5::Instantiate,
file_analysis::SHA1::Instantiate,
file_analysis::SHA256::Instantiate,
file_analysis::DataEvent::Instantiate,
};
static void action_del_func(void* v)