Merge remote-tracking branch 'origin/master' into topic/johanna/imap-starttls

This commit is contained in:
Johanna Amann 2016-04-26 12:48:53 -07:00
commit 124126cabc
4 changed files with 18 additions and 1 deletions

View file

@ -0,0 +1,5 @@
# Test that the timestamp of a pre-y-2000 certificate is correctly parsed
# @TEST-EXEC: bro -r $TRACES/tls/telesec.pcap
# @TEST-EXEC: btest-diff x509.log