From e378aa8d15898a64b8f8b89eee45c987ce018150 Mon Sep 17 00:00:00 2001 From: William Correia Date: Wed, 12 Apr 2023 16:36:55 -0400 Subject: [PATCH] modbus: bump crate version sawp 0.12 is available and addresses future compilation failures in dependent crates. Updated modbus test case to expect 12 bytes needed instead of 15. This aligns with expectations as the test case slices 3 bytes off the end of a 12 byte message so needing 12 bytes is correct. Ticket #5989 --- rust/Cargo.toml.in | 4 ++-- rust/src/modbus/detect.rs | 2 +- rust/src/modbus/modbus.rs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rust/Cargo.toml.in b/rust/Cargo.toml.in index 587cf7c208..0d47b9eedd 100644 --- a/rust/Cargo.toml.in +++ b/rust/Cargo.toml.in @@ -39,14 +39,14 @@ hkdf = "~0.12.3" aes = "~0.7.5" aes-gcm = "~0.9.4" -sawp-modbus = "~0.11.0" -sawp = "~0.11.0" der-parser = "~8.2.0" kerberos-parser = { version = "~0.7.1", default_features = false } # Kerberos parsing still depends on der-parser 6.0.1. der-parser6 = { package = "der-parser", version = "~6.0.1", default_features = false } +sawp-modbus = "~0.12.1" +sawp = "~0.12.1" ntp-parser = "~0.6.0" ipsec-parser = "~0.7.0" snmp-parser = "~0.9.0" diff --git a/rust/src/modbus/detect.rs b/rust/src/modbus/detect.rs index 93937b0bde..fdd5d51db9 100644 --- a/rust/src/modbus/detect.rs +++ b/rust/src/modbus/detect.rs @@ -238,7 +238,7 @@ fn inspect_data(msg: &Message, modbus: &DetectModbusRust) -> bool { return true; }; - if let Some(value) = msg.get_write_value_at_address(&sig_address) { + if let Some(value) = msg.get_write_value_at_address(sig_address) { check_match(sig_value, value) } else { false diff --git a/rust/src/modbus/modbus.rs b/rust/src/modbus/modbus.rs index 79da345712..246e9cae6d 100644 --- a/rust/src/modbus/modbus.rs +++ b/rust/src/modbus/modbus.rs @@ -1185,7 +1185,7 @@ mod tests { fn fragmentation_1_adu_in_2_tcp_packets() { let mut state = ModbusState::new(); assert_eq!( - AppLayerResult::incomplete(0, 15), + AppLayerResult::incomplete(0, 12), state.parse( &RD_COILS_REQ[0..(RD_COILS_REQ.len() - 3)], Direction::ToServer -- 2.47.2