Merge remote-tracking branch 'origin/master' into topic/liangzhu/analyzer-ocsp

This commit is contained in:
Liang Zhu 2015-08-05 17:15:09 -07:00
commit adbc0b1eaf
22 changed files with 1042 additions and 174 deletions

View file

@ -0,0 +1,8 @@
# @TEST-EXEC: bro -r ${TRACES}/http/flash-version.trace %INPUT
# @TEST-EXEC: btest-diff software.log
@load protocols/http/software
@load protocols/http/software-browser-plugins
redef Software::asset_tracking = ALL_HOSTS;