aiden
/
suricata
mirror of https://github.com/OISF/suricata
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rustfmt: rust/src/mime/smtp.rs

Browse Source
pull/12799/head
Alice Akaki 1 year ago committed by Victor Julien
parent 1c50de4ad0
commit 90cf59ac71
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File

36
rust/src/mime/smtp.rs
Unescape Escape View File

@ -16,9 +16,9 @@
*/ */
use super::mime; use super::mime;
use crate::utils::base64;
use crate::core::StreamingBufferConfig; use crate::core::StreamingBufferConfig;
use crate::filecontainer::FileContainer; use crate::filecontainer::FileContainer;
use crate::utils::base64;
use digest::generic_array::{typenum::U16, GenericArray}; use digest::generic_array::{typenum::U16, GenericArray};
use digest::Digest; use digest::Digest;
use digest::Update; use digest::Update;
@ -457,17 +457,16 @@ fn mime_smtp_parse_line(
for _i in 0..4 - decoder.nb { for _i in 0..4 - decoder.nb {
v.push(b'='); v.push(b'=');
} }
let dec_size = base64::get_decoded_buffer_size((decoder.nb as usize + v.len()) as u32); let dec_size = base64::get_decoded_buffer_size(
(decoder.nb as usize + v.len()) as u32,
);
let mut dec = vec![0; dec_size as usize]; let mut dec = vec![0; dec_size as usize];
let mut dec_len = 0; let mut dec_len = 0;
if base64::decode_rfc2045(decoder, &v, &mut dec, &mut dec_len).is_ok() { if base64::decode_rfc2045(decoder, &v, &mut dec, &mut dec_len)
.is_ok()
{
unsafe { unsafe {
FileAppendData( FileAppendData(ctx.files, ctx.sbcfg, dec.as_ptr(), dec_len);
ctx.files,
ctx.sbcfg,
dec.as_ptr(),
dec_len,
);
} }
} }
} }
@ -505,10 +504,14 @@ fn mime_smtp_parse_line(
if i.len() > MAX_ENC_LINE_LEN { if i.len() > MAX_ENC_LINE_LEN {
warnings |= MIME_ANOM_LONG_ENC_LINE; warnings |= MIME_ANOM_LONG_ENC_LINE;
} }
let dec_size = base64::get_decoded_buffer_size((decoder.nb as usize + i.len()) as u32); let dec_size = base64::get_decoded_buffer_size(
(decoder.nb as usize + i.len()) as u32,
);
let mut dec = vec![0; dec_size as usize]; let mut dec = vec![0; dec_size as usize];
let mut dec_len = 0; // unnecessary but required by fn args let mut dec_len = 0; // unnecessary but required by fn args
if base64::decode_rfc2045(decoder, i, &mut dec, &mut dec_len).is_ok() { if base64::decode_rfc2045(decoder, i, &mut dec, &mut dec_len)
.is_ok()
{
mime_smtp_find_url_strings(ctx, &dec); mime_smtp_find_url_strings(ctx, &dec);
} else { } else {
warnings |= MIME_ANOM_INVALID_BASE64; warnings |= MIME_ANOM_INVALID_BASE64;
@ -547,18 +550,15 @@ fn mime_smtp_parse_line(
if i.len() > MAX_ENC_LINE_LEN { if i.len() > MAX_ENC_LINE_LEN {
warnings |= MIME_ANOM_LONG_ENC_LINE; warnings |= MIME_ANOM_LONG_ENC_LINE;
} }
let dec_size = base64::get_decoded_buffer_size((decoder.nb as usize + i.len()) as u32); let dec_size = base64::get_decoded_buffer_size(
(decoder.nb as usize + i.len()) as u32,
);
let mut dec = vec![0; dec_size as usize]; let mut dec = vec![0; dec_size as usize];
let mut dec_len = 0; let mut dec_len = 0;
if base64::decode_rfc2045(decoder, i, &mut dec, &mut dec_len).is_ok() { if base64::decode_rfc2045(decoder, i, &mut dec, &mut dec_len).is_ok() {
mime_smtp_find_url_strings(ctx, &dec); mime_smtp_find_url_strings(ctx, &dec);
unsafe { unsafe {
FileAppendData( FileAppendData(ctx.files, ctx.sbcfg, dec.as_ptr(), dec_len);
ctx.files,
ctx.sbcfg,
dec.as_ptr(),
dec_len,
);
} }
} else { } else {
warnings |= MIME_ANOM_INVALID_BASE64; warnings |= MIME_ANOM_INVALID_BASE64;

Write Preview
Loading…
Cancel
Save