]> git.ipfire.org Git - thirdparty/suricata.git/commitdiff
rust/ike: fix collapsible_match clippy warning 11595/head
authorPhilippe Antoine <pantoine@oisf.net>
Wed, 31 Jul 2024 12:15:14 +0000 (14:15 +0200)
committerVictor Julien <victor@inliniac.net>
Thu, 1 Aug 2024 05:05:16 +0000 (07:05 +0200)
warning: this `match` can be collapsed into the outer `match`
help: the outer pattern can be modified to include the inner pattern

rust/src/ike/ikev2.rs

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