mirror of
https://github.com/zeek/zeek.git
synced 2025-10-07 09:08:20 +00:00
GH-566: fix cases where ssh_encrypted_packet event wasn't raised
When encrypted data was bundled within the same segment as the NewKeys message, it wasn't not reported via a ssh_encrypted_package event as it should have been.
This commit is contained in:
parent
d773b6986b
commit
30da2f83d0
8 changed files with 147 additions and 10 deletions
|
@ -0,0 +1,21 @@
|
|||
# In the pcaps used here, the first encrypted packet is sent along with NEWKEYS
|
||||
# message of either the client (1st pcap) or the server (2nd pcap) instead of
|
||||
# separately. The "ssh_encrypted_packet" should be raised for such encrypted
|
||||
# data appearing within the same tcp segment delivery as other non-encrypted
|
||||
# messages.
|
||||
|
||||
# @TEST-EXEC: zeek -b -C -r $TRACES/ssh/ssh_client_sends_first_enc_pkt_with_newkeys.pcap %INPUT > client.out
|
||||
# @TEST-EXEC: zeek -b -C -r $TRACES/ssh/ssh_server_sends_first_enc_pkt_with_newkeys.pcap %INPUT > server.out
|
||||
# @TEST-EXEC: btest-diff client.out
|
||||
# @TEST-EXEC: btest-diff server.out
|
||||
|
||||
@load base/protocols/ssh
|
||||
|
||||
global pkts: count = 0;
|
||||
redef SSH::disable_analyzer_after_detection = F;
|
||||
|
||||
event ssh_encrypted_packet(c: connection, orig: bool, len: count)
|
||||
{
|
||||
print pkts, orig, len;
|
||||
++pkts;
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue