#120: Pull in PR, and make a couple small cleanup tweaks.

This commit is contained in:
Vlad Grigorescu 2018-06-02 17:29:01 -05:00
parent 7e5788bff0
commit fde88fa717
2 changed files with 2 additions and 2 deletions

View file

@ -178,7 +178,7 @@ refine flow SSH_Flow += {
%{ %{
switch (v) { switch (v) {
case SSH1: case SSH1:
return packet_length + 4 + 8 -(packet_length%8); return packet_length + 4 + 8 - (packet_length % 8);
case SSH2: case SSH2:
return packet_length + 4; return packet_length + 4;
default: default:

View file

@ -38,7 +38,7 @@ type SSH1_Key_Exchange(is_orig: bool, packet_length: uint32) = record {
msg_type : uint8; msg_type : uint8;
message : SSH1_Message(is_orig, msg_type, packet_length - 5); message : SSH1_Message(is_orig, msg_type, packet_length - 5);
crc : uint32; crc : uint32;
} &length = packet_length + 8 - (packet_length % 8); } &length = $context.flow.get_kex_length($context.connection.get_version(), packet_length) - 4;
type SSH1_Message(is_orig: bool, msg_type: uint8, length: uint32) = case msg_type of { type SSH1_Message(is_orig: bool, msg_type: uint8, length: uint32) = case msg_type of {
SSH_SMSG_PUBLIC_KEY -> public_key : SSH1_PUBLIC_KEY(length); SSH_SMSG_PUBLIC_KEY -> public_key : SSH1_PUBLIC_KEY(length);