Merge branch 'master' of ssh://git.bro-ids.org/bro

This commit is contained in:
Seth Hall 2011-09-29 13:07:37 -04:00
commit 936e6ad746
36 changed files with 321 additions and 134 deletions

View file

@ -5,6 +5,7 @@
@load base/protocols/ssl
@load base/frameworks/notice
@load base/utils/directions-and-hosts
module SSL;
@ -58,5 +59,3 @@ event x509_certificate(c: connection, cert: X509, is_server: bool, chain_idx: co
$conn=c, $suppress_for=1day,
$identifier=fmt("%s:%d-%s", c$id$resp_h, c$id$resp_p, md5_hash(der_cert))]);
}

View file

@ -14,6 +14,7 @@
##!
@load base/protocols/ssl
@load base/utils/directions-and-hosts
module SSL;
@ -45,4 +46,4 @@ event ssl_established(c: connection)
local side = Site::is_local_addr(c$id$resp_h) ? "local" : "remote";
local cmd = fmt("%s x509 -inform DER -outform PEM >> certs-%s.pem", openssl_util, side);
piped_exec(cmd, c$ssl$cert);
}
}