rust: format ike files

Ticket: 3836

.github/workflows/builds.yml

@@ -393,7 +393,7 @@ jobs:
               rust/src/ldap/*.rs rust/src/mime/*.rs rust/src/ntp/*.rs rust/src/quic/*.rs
               rust/src/rfb/*.rs rust/src/ssh/*.rs rust/src/utils/*.rs rust/src/websocket/*.rs
               rust/src/dhcp/*.rs rust/src/krb/*.rs rust/src/mdns/*.rs rust/src/pop3/*.rs
-              rust/src/http2/*.rs
+              rust/src/http2/*.rs rust/src/ike/*.rs
       - name: Check if Cargo.lock.in is up to date
         run: |
           cp rust/Cargo.lock rust/Cargo.lock.in

rust/src/ike/ikev1.rs

@@ -52,9 +52,7 @@ impl Ikev1ParticipantData {
         self.transform.clear();
     }
 
-    pub fn update(
+    pub fn update(&mut self, key_exchange: &str, nonce: &str, transforms: &[Vec<SaAttribute>]) {
-        &mut self, key_exchange: &str, nonce: &str, transforms: &[Vec<SaAttribute>],
-    ) {
         self.key_exchange = key_exchange.to_string();
         self.nonce = nonce.to_string();
         if self.nb_transforms == 0 && !transforms.is_empty() {
@@ -103,7 +101,9 @@ pub fn handle_ikev1(
                         &mut tx.hdr.ikev1_transforms,
                         &mut tx.hdr.ikev1_header.vendor_ids,
                         &mut payload_types,
-                    ).is_err() {
+                    )
+                    .is_err()
+                    {
                         SCLogDebug!("Error while parsing IKEV1 payloads");
                         return AppLayerResult::err();
                     }

rust/src/ike/parser.rs

@@ -258,7 +258,8 @@ pub fn parse_security_association(i: &[u8]) -> IResult<&[u8], SecurityAssociatio
     let (i, situation) = cond(domain_of_interpretation == 1, take(4_usize)).parse(i)?;
     let (i, data) = cond(domain_of_interpretation == 1 && start_i.len() >= 8, |b| {
         take(start_i.len() - 8).parse(b)
-    }).parse(i)?;
+    })
+    .parse(i)?;
     Ok((
         i,
         SecurityAssociationPayload {
@@ -283,7 +284,8 @@ pub fn parse_proposal(i: &[u8]) -> IResult<&[u8], ProposalPayload<'_>> {
     let (i, spi) = take(spi_size as usize)(i)?;
     let (i, payload_data) = cond((start_i.len() - 4) >= usize::from(spi_size), |b| {
         take((start_i.len() - 4) - spi_size as usize).parse(b)
-    }).parse(i)?;
+    })
+    .parse(i)?;
     let payload = ProposalPayload {
         _proposal_number: proposal_number,
         _proposal_type: proposal_type,
@@ -403,7 +405,8 @@ pub fn parse_sa_attribute(i: &[u8]) -> IResult<&[u8], Vec<SaAttribute>> {
         let (i, variable_attribute_value) = cond(
             format.0 == 0 && attribute_length_or_value != 4,
             take(attribute_length_or_value),
-        ).parse(i)?;
+        )
+        .parse(i)?;
         let at = AttributeType::from_u(format.1);
         let attribute_type = if let Some(a) = at {
             a
@@ -431,8 +434,7 @@ pub fn parse_sa_attribute(i: &[u8]) -> IResult<&[u8], Vec<SaAttribute>> {
                 _ => None,
             },
             hex_value: match format.0 {
-                0 => variable_attribute_value
+                0 => variable_attribute_value.map(to_hex),
-                    .map(to_hex),
                 _ => None,
             },
         };
@@ -450,7 +452,8 @@ pub fn parse_ikev1_payload_list(i: &[u8]) -> IResult<&[u8], Vec<IsakmpPayload<'_
         let (i, next_payload) = be_u8(i)?;
         let (i, reserved) = be_u8(i)?;
         let (i, payload_length) = be_u16(i)?;
-        let (i, payload_data) = cond(payload_length >= 4, |b| take(payload_length - 4).parse(b)).parse(i)?;
+        let (i, payload_data) =
+            cond(payload_length >= 4, |b| take(payload_length - 4).parse(b)).parse(i)?;
         Ok((
             i,
             IsakmpPayload {
@@ -517,7 +520,9 @@ pub fn parse_payload(
                 transforms,
                 vendor_ids,
                 payload_types,
-            ).is_err() {
+            )
+            .is_err()
+            {
                 SCLogDebug!("Error parsing SecurityAssociation");
                 return Err(());
             }
@@ -533,7 +538,9 @@ pub fn parse_payload(
                 transforms,
                 vendor_ids,
                 payload_types,
-            ).is_err() {
+            )
+            .is_err()
+            {
                 SCLogDebug!("Error parsing Proposal");
                 return Err(());
             }
@@ -593,7 +600,9 @@ fn parse_proposal_payload(
                             transforms,
                             vendor_ids,
                             payload_types,
-                        ).is_err() {
+                        )
+                        .is_err()
+                        {
                             SCLogDebug!("Error parsing transform payload");
                             return Err(());
                         }
@@ -644,7 +653,9 @@ fn parse_security_association_payload(
                                     transforms,
                                     vendor_ids,
                                     payload_types,
-                                ).is_err() {
+                                )
+                                .is_err()
+                                {
                                     SCLogDebug!("Error parsing proposal payload");
                                     return Err(());
                                 }