From f5ac0e201c232ed8e79994b90b83058b8ec79121 Mon Sep 17 00:00:00 2001 From: Philippe Antoine Date: Mon, 27 Apr 2026 17:26:17 +0200 Subject: [PATCH] rust: format asn1 files Ticket: 3836 --- .github/workflows/builds.yml | 2 +- rust/src/asn1/mod.rs | 6 ++---- rust/src/asn1/parse_rules.rs | 16 ++++++---------- 3 files changed, 9 insertions(+), 15 deletions(-) diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index 2ce225114c..c28a3072af 100644 --- a/.github/workflows/builds.yml +++ b/.github/workflows/builds.yml @@ -388,7 +388,7 @@ jobs: working-directory: rust/sys - run: cargo fmt --check working-directory: rust/derive - - run: rustfmt --check rust/src/dns/*.rs rust/src/applayertemplate/*.rs + - run: rustfmt --check rust/src/dns/*.rs rust/src/applayertemplate/*.rs rust/src/asn1/*.rs - name: Check if Cargo.lock.in is up to date run: | cp rust/Cargo.lock rust/Cargo.lock.in diff --git a/rust/src/asn1/mod.rs b/rust/src/asn1/mod.rs index 40cd7a76aa..9fd0da601c 100644 --- a/rust/src/asn1/mod.rs +++ b/rust/src/asn1/mod.rs @@ -107,9 +107,7 @@ impl<'a> Asn1<'a> { && obj.header.is_primitive()) { if let BerObjectContent::BitString(bits, _v) = &obj.content { - if len > 0 - && *bits as usize > len.saturating_mul(8) - { + if len > 0 && *bits as usize > len.saturating_mul(8) { return Some(Asn1Check::BitstringOverflow); } } @@ -226,7 +224,7 @@ pub unsafe extern "C" fn SCAsn1Decode( let slice = build_slice!(input, input_len as usize); - let ad = &*ad_ptr ; + let ad = &*ad_ptr; let res = asn1_decode(slice, buffer_offset, ad); diff --git a/rust/src/asn1/parse_rules.rs b/rust/src/asn1/parse_rules.rs index 66451bc025..e0b41b9f51 100644 --- a/rust/src/asn1/parse_rules.rs +++ b/rust/src/asn1/parse_rules.rs @@ -125,10 +125,7 @@ fn parse_i32_number(input: &str) -> IResult<&str, i32> { pub(super) fn asn1_parse_rule(input: &str) -> IResult<&str, DetectAsn1Data> { // If nothing to parse, return if input.is_empty() { - return Err(Err::Error(make_error( - input, - ErrorKind::Eof, - ))); + return Err(Err::Error(make_error(input, ErrorKind::Eof))); } // Rule parsing functions @@ -155,7 +152,8 @@ pub(super) fn asn1_parse_rule(input: &str) -> IResult<&str, DetectAsn1Data> { verify(parse_i32_number, |v| { *v >= -i32::from(u16::MAX) && *v <= i32::from(u16::MAX) }), - ).parse(i) + ) + .parse(i) } let mut data = DetectAsn1Data::default(); @@ -183,7 +181,8 @@ pub(super) fn asn1_parse_rule(input: &str) -> IResult<&str, DetectAsn1Data> { opt(absolute_offset), opt(relative_offset), opt(alt((multispace1, tag(",")))), - ).parse(rest)?; + ) + .parse(rest)?; if bitstring_overflow.is_some() { data.bitstring_overflow = true; @@ -196,10 +195,7 @@ pub(super) fn asn1_parse_rule(input: &str) -> IResult<&str, DetectAsn1Data> { } else if let Some((_, v)) = relative_offset { data.relative_offset = Some(v); } else { - return Err(Err::Error(make_error( - rest, - ErrorKind::Verify, - ))); + return Err(Err::Error(make_error(rest, ErrorKind::Verify))); } rest = new_rest;