Merge remote-tracking branch 'origin/fastpath'

* origin/fastpath:
  Correct a notice for heartbleed. The notice is thrown correctly, just the message conteined wrong values.
  Improve/standardize some malloc/realloc return val checks.
  Improve file analysis manager shutdown/cleanup.
This commit is contained in:
Robin Sommer 2014-05-01 09:30:06 -07:00
commit eed94fab76
11 changed files with 54 additions and 14 deletions

View file

@ -106,7 +106,7 @@ event ssl_encrypted_heartbeat(c: connection, is_orig: bool, length: count)
{
NOTICE([$note=SSL_Heartbeat_Attack_Success,
$msg=fmt("An Encrypted TLS heartbleed attack was probably detected! First packet client record length %d, first packet server record length %d",
c$ssl?$last_originator_heartbeat_request_size, c$ssl$last_originator_heartbeat_request_size),
c$ssl$last_originator_heartbeat_request_size, length),
$conn=c,
$identifier=c$uid # only throw once per connection
]);