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

rust: fix clippy lint for single_char_add_str

Browse Source 
Idiomatic cleanup and a fix automatically done by `cargo clippy --fix`.
pull/7966/head
Jason Ish 4 years ago committed by Victor Julien
parent f3e4bcfe23
commit 85cfa7254b
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File

20
rust/src/quic/frames.rs
Unescape Escape View File

@ -203,14 +203,14 @@ pub struct QuicTlsExtension {
} }
fn quic_tls_ja3_client_extends(ja3: &mut String, exts: Vec<TlsExtension>) { fn quic_tls_ja3_client_extends(ja3: &mut String, exts: Vec<TlsExtension>) {
ja3.push_str(","); ja3.push(',');
let mut dash = false; let mut dash = false;
for e in &exts { for e in &exts {
match e { match e {
TlsExtension::EllipticCurves(x) => { TlsExtension::EllipticCurves(x) => {
for ec in x { for ec in x {
if dash { if dash {
ja3.push_str("-"); ja3.push('-');
} else { } else {
dash = true; dash = true;
} }
@ -220,14 +220,14 @@ fn quic_tls_ja3_client_extends(ja3: &mut String, exts: Vec<TlsExtension>) {
_ => {} _ => {}
} }
} }
ja3.push_str(","); ja3.push(',');
dash = false; dash = false;
for e in &exts { for e in &exts {
match e { match e {
TlsExtension::EcPointFormats(x) => { TlsExtension::EcPointFormats(x) => {
for ec in *x { for ec in *x {
if dash { if dash {
ja3.push_str("-"); ja3.push('-');
} else { } else {
dash = true; dash = true;
} }
@ -250,7 +250,7 @@ fn quic_get_tls_extensions(
for e in &exts { for e in &exts {
let etype = TlsExtensionType::from(e); let etype = TlsExtensionType::from(e);
if dash { if dash {
ja3.push_str("-"); ja3.push('-');
} else { } else {
dash = true; dash = true;
} }
@ -289,17 +289,17 @@ fn parse_quic_handshake(msg: TlsMessage) -> Option<Frame> {
ClientHello(ch) => { ClientHello(ch) => {
let mut ja3 = String::with_capacity(256); let mut ja3 = String::with_capacity(256);
ja3.push_str(&u16::from(ch.version).to_string()); ja3.push_str(&u16::from(ch.version).to_string());
ja3.push_str(","); ja3.push(',');
let mut dash = false; let mut dash = false;
for c in &ch.ciphers { for c in &ch.ciphers {
if dash { if dash {
ja3.push_str("-"); ja3.push('-');
} else { } else {
dash = true; dash = true;
} }
ja3.push_str(&u16::from(*c).to_string()); ja3.push_str(&u16::from(*c).to_string());
} }
ja3.push_str(","); ja3.push(',');
let ciphers = ch.ciphers; let ciphers = ch.ciphers;
let extv = quic_get_tls_extensions(ch.ext, &mut ja3, true); let extv = quic_get_tls_extensions(ch.ext, &mut ja3, true);
return Some(Frame::Crypto(Crypto { ciphers, extv, ja3 })); return Some(Frame::Crypto(Crypto { ciphers, extv, ja3 }));
@ -307,9 +307,9 @@ fn parse_quic_handshake(msg: TlsMessage) -> Option<Frame> {
ServerHello(sh) => { ServerHello(sh) => {
let mut ja3 = String::with_capacity(256); let mut ja3 = String::with_capacity(256);
ja3.push_str(&u16::from(sh.version).to_string()); ja3.push_str(&u16::from(sh.version).to_string());
ja3.push_str(","); ja3.push(',');
ja3.push_str(&u16::from(sh.cipher).to_string()); ja3.push_str(&u16::from(sh.cipher).to_string());
ja3.push_str(","); ja3.push(',');
let ciphers = vec![sh.cipher]; let ciphers = vec![sh.cipher];
let extv = quic_get_tls_extensions(sh.ext, &mut ja3, false); let extv = quic_get_tls_extensions(sh.ext, &mut ja3, false);
return Some(Frame::Crypto(Crypto { ciphers, extv, ja3 })); return Some(Frame::Crypto(Crypto { ciphers, extv, ja3 }));

Write Preview
Loading…
Cancel
Save