upstream/suricata
1
0
Fork 0
mirror of https://github.com/OISF/suricata.git synced 2026-05-28 04:32:12 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

rust: format asn1 files

Browse source 
Ticket: 3836
This commit is contained in:
Philippe Antoine 2026-04-27 17:26:17 +02:00 committed by Victor Julien
parent 1ced97bdbb
commit f5ac0e201c
3 changed files with 9 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/builds.yml vendored
View file

@ -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

6
rust/src/asn1/mod.rs
View file

@ -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);

16
rust/src/asn1/parse_rules.rs
View file

@ -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;