diff --git a/rust/Cargo.toml.in b/rust/Cargo.toml.in index 12fcbae906..d506e861a2 100644 --- a/rust/Cargo.toml.in +++ b/rust/Cargo.toml.in @@ -43,7 +43,7 @@ kerberos-parser = "~0.5.0" ntp-parser = "~0.6.0" ipsec-parser = "~0.7.0" snmp-parser = "~0.6.0" -tls-parser = "~0.9.4" +tls-parser = "~0.11.0" x509-parser = "~0.6.5" libc = "~0.2.82" sha2 = "~0.9.2" diff --git a/rust/src/rdp/rdp.rs b/rust/src/rdp/rdp.rs index 4bb9f22ca7..40c2cd548e 100644 --- a/rust/src/rdp/rdp.rs +++ b/rust/src/rdp/rdp.rs @@ -26,6 +26,7 @@ use nom; use std; use std::collections::VecDeque; use tls_parser::{parse_tls_plaintext, TlsMessage, TlsMessageHandshake, TlsRecordType}; +use tls_parser::nom::Err; static mut ALPROTO_RDP: AppProto = ALPROTO_UNKNOWN; @@ -184,7 +185,7 @@ impl RdpState { available = remainder; } - Err(nom::Err::Incomplete(_)) => { + Err(Err::Incomplete(_)) => { // nom need not compatible with applayer need, request one more byte return AppLayerResult::incomplete( (input.len() - available.len()) as u32, @@ -192,7 +193,7 @@ impl RdpState { ); } - Err(nom::Err::Failure(_)) | Err(nom::Err::Error(_)) => { + Err(Err::Failure(_)) | Err(Err::Error(_)) => { return AppLayerResult::err(); } } @@ -296,7 +297,7 @@ impl RdpState { } } - Err(nom::Err::Incomplete(_)) => { + Err(Err::Incomplete(_)) => { // nom need not compatible with applayer need, request one more byte return AppLayerResult::incomplete( (input.len() - available.len()) as u32, @@ -304,7 +305,7 @@ impl RdpState { ); } - Err(nom::Err::Failure(_)) | Err(nom::Err::Error(_)) => { + Err(Err::Failure(_)) | Err(Err::Error(_)) => { return AppLayerResult::err(); } }