Merge remote-tracking branch 'origin/master' into topic/seth/sumstats-updates

Conflicts:
	doc/scripts/DocSourcesList.cmake
	scripts/test-all-policy.bro
This commit is contained in:
Seth Hall 2013-07-30 11:48:03 -04:00
commit 7db531e162
808 changed files with 37774 additions and 19706 deletions

View file

@ -71,7 +71,14 @@
# Detect logins using "interesting" hostnames.
@load protocols/ssh/interesting-hostnames
# Detect MD5 sums in Team Cymru's Malware Hash Registry.
@load protocols/http/detect-MHR
# Detect SQL injection attacks.
@load protocols/http/detect-sqli
#### Network File Handling ####
# Enable MD5 and SHA1 hashing for all files.
@load frameworks/files/hash-all-files
# Detect SHA1 sums in Team Cymru's Malware Hash Registry.
@load frameworks/files/detect-MHR