Robin Sommer 9efb549236 Merge remote-tracking branch 'origin/topic/jsiwek/file-signatures' ... * origin/topic/jsiwek/file-signatures: File type detection changes and fix https.log {orig,resp}_fuids fields. Various minor changes related to file mime type detection. Refactor common MIME magic matching code. Replace libmagic w/ Bro signatures for file MIME type identification. Conflicts: scripts/base/init-default.bro testing/btest/Baseline/coverage.bare-load-baseline/canonified_loaded_scripts.log testing/btest/Baseline/coverage.default-load-baseline/canonified_loaded_scripts.log BIT-1143 #merged		2014-03-30 22:51:05 +02:00
..
files	Merge remote-tracking branch 'origin/topic/bernhard/file-analysis-x509'	2014-03-14 09:53:07 -07:00
frameworks	Merge remote-tracking branch 'origin/topic/jsiwek/file-signatures'	2014-03-30 22:51:05 +02:00
misc	Add script to detect filtered TCP traces, addresses BIT-1119.	2014-01-31 17:04:58 -06:00
protocols	Merge remote-tracking branch 'origin/topic/jsiwek/file-signatures'	2014-03-30 22:51:05 +02:00
utils	Return the Dir module to file name tracking instead of inode tracking.	2013-10-29 11:09:55 -04:00
init-bare.bro	Merge remote-tracking branch 'origin/topic/jsiwek/file-signatures'	2014-03-30 22:51:05 +02:00
init-default.bro	Finishing touches of the x509 file analyzer.	2014-03-13 15:21:30 -07:00