Merge remote-tracking branch 'origin/master' into topic/johanna/tls13-details

This commit is contained in:
Johanna Amann 2019-06-07 16:52:38 +10:00
commit 6707328c55
182 changed files with 2281 additions and 1613 deletions

View file

@ -0,0 +1,13 @@
# @TEST-EXEC: zeek -r $TRACES/rdp/rdp-proprietary-encryption.pcap %INPUT >out
# @TEST-EXEC: btest-diff out
@load base/protocols/rdp
event rdp_client_security_data(c: connection, data: RDP::ClientSecurityData)
{
print "rdp_client_security_data", data;
print " 40-bit flag", data$encryption_methods & 0x00000001 != 0;
print " 128-bit flag", data$encryption_methods & 0x00000002 != 0;
print " 56-bit flag", data$encryption_methods & 0x00000008 != 0;
print " fips flag", data$encryption_methods & 0x00000010 != 0;
}

View file

@ -0,0 +1,14 @@
# @TEST-EXEC: zeek -r $TRACES/rdp/rdp-proprietary-encryption.pcap %INPUT >out
# @TEST-EXEC: btest-diff out
@load base/protocols/rdp
event rdp_native_encrypted_data(c: connection, orig: bool, len: count)
{
print "rdp native encrypted data", orig, len;
if ( ! orig )
# That's fine to stop here, we don't need to check the entire
# encrypted conversation for the purpose of the unit test.
terminate();
}