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

rust/ike: fix collapsible_match clippy warning

Browse Source 
warning: this `match` can be collapsed into the outer `match`
help: the outer pattern can be modified to include the inner pattern
pull/11595/head
Philippe Antoine 1 year ago committed by Victor Julien
parent 564f685eea
commit 42e5e556e5
1 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File

38
rust/src/ike/ikev2.rs
Unescape Escape View File

@ -186,24 +186,20 @@ fn add_proposals(
// Rule 1: warn on weak or unknown transforms // Rule 1: warn on weak or unknown transforms
for xform in &transforms { for xform in &transforms {
match *xform { match *xform {
IkeV2Transform::Encryption(ref enc) => { IkeV2Transform::Encryption(
match *enc { IkeTransformEncType::ENCR_DES_IV64
IkeTransformEncType::ENCR_DES_IV64 | IkeTransformEncType::ENCR_DES
| IkeTransformEncType::ENCR_DES | IkeTransformEncType::ENCR_3DES
| IkeTransformEncType::ENCR_3DES | IkeTransformEncType::ENCR_RC5
| IkeTransformEncType::ENCR_RC5 | IkeTransformEncType::ENCR_IDEA
| IkeTransformEncType::ENCR_IDEA | IkeTransformEncType::ENCR_CAST
| IkeTransformEncType::ENCR_CAST | IkeTransformEncType::ENCR_BLOWFISH
| IkeTransformEncType::ENCR_BLOWFISH | IkeTransformEncType::ENCR_3IDEA
| IkeTransformEncType::ENCR_3IDEA | IkeTransformEncType::ENCR_DES_IV32
| IkeTransformEncType::ENCR_DES_IV32 | IkeTransformEncType::ENCR_NULL,
| IkeTransformEncType::ENCR_NULL => { ) => {
SCLogDebug!("Weak Encryption: {:?}", enc); // XXX send event only if direction == Direction::ToClient ?
// XXX send event only if direction == Direction::ToClient ? tx.set_event(IkeEvent::WeakCryptoEnc);
tx.set_event(IkeEvent::WeakCryptoEnc);
}
_ => (),
}
} }
IkeV2Transform::PRF(ref prf) => match *prf { IkeV2Transform::PRF(ref prf) => match *prf {
IkeTransformPRFType::PRF_NULL => { IkeTransformPRFType::PRF_NULL => {
@ -276,9 +272,9 @@ fn add_proposals(
IkeV2Transform::Auth(_) => true, IkeV2Transform::Auth(_) => true,
_ => false, _ => false,
}) && !transforms.iter().any(|x| match *x { }) && !transforms.iter().any(|x| match *x {
IkeV2Transform::Encryption(ref enc) => enc.is_aead(), IkeV2Transform::Encryption(ref enc) => enc.is_aead(),
_ => false, _ => false,
}) { }) {
SCLogDebug!("No integrity transform found"); SCLogDebug!("No integrity transform found");
tx.set_event(IkeEvent::WeakCryptoNoAuth); tx.set_event(IkeEvent::WeakCryptoNoAuth);
} }

Write Preview
Loading…
Cancel
Save