]> git.ipfire.org Git - thirdparty/suricata.git/commitdiff
rdp: bump up tls-parser crate version
authorPhilippe Antoine <contact@catenacyber.fr>
Tue, 22 Feb 2022 07:49:46 +0000 (08:49 +0100)
committerPhilippe Antoine <pantoine@oisf.net>
Tue, 2 Aug 2022 12:31:27 +0000 (14:31 +0200)
so that we can use new functions in quic parser

rust/Cargo.toml.in
rust/src/rdp/rdp.rs

index 12fcbae906ebdb62dae6f77a2b3b830d8106568d..d506e861a2942359dcb081f093c8bd12a0e4781f 100644 (file)
@@ -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"
index 4bb9f22ca7645399331e7ab640fc580b719421a8..40c2cd548ef1e385c9f6c8a60e7a6224a3fafc8f 100644 (file)
@@ -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();
                     }
                 }