Nom41

Cargo.toml

@@ -6,7 +6,7 @@ homepage = "https://github.com/rusticata/ipsec-parser"
 repository = "https://github.com/rusticata/ipsec-parser.git"
 documentation = "https://docs.rs/ipsec-parser"
 name = "ipsec-parser"
-version = "0.3.0"
+version = "0.4.0"
 authors = ["Pierre Chifflier <[email protected]>"]
 categories = ["parsing"]
 
@@ -20,7 +20,7 @@ include = [
 ]
 
 [dependencies]
-nom = "4.0"
+nom = "4.1"
 rusticata-macros = "1.0"
 
 [badges]

src/esp.rs

@@ -1,6 +1,6 @@
-use nom::{IResult,be_u32,rest};
-use ikev2::IkeV2Header;
-use ikev2_parser::parse_ikev2_header;
+use crate::ikev2::IkeV2Header;
+use crate::ikev2_parser::parse_ikev2_header;
+use nom::{be_u32, rest, IResult};
 
 /// Encapsulating Security Payload Packet Format
 ///
@@ -9,7 +9,7 @@ use ikev2_parser::parse_ikev2_header;
 pub struct ESPHeader<'a> {
     pub spi_index: &'a [u8],
     pub seq: u32,
-    pub data: &'a[u8]
+    pub data: &'a [u8],
 }
 
 /// UDP-encapsulated Packet Formats
@@ -21,15 +21,14 @@ pub enum ESPData<'a> {
     IKE(IkeV2Header),
 }
 
-
 /// Parse an encapsulated ESP packet
 ///
 /// The type of encapsulated data depends on the first field (`spi_index`): 0 is a forbidden SPI
 /// index, and indicates that the header is an IKE header.
 /// Any other value indicates an ESP header.
 ///
 /// *Note: input is entirely consumed*
-pub fn parse_esp_encapsulated<'a>(i: &'a[u8]) -> IResult<&'a[u8],ESPData<'a>> {
+pub fn parse_esp_encapsulated<'a>(i: &'a [u8]) -> IResult<&'a [u8], ESPData<'a>> {
     if peek!(i, be_u32)?.1 == 0 {
         parse_ikev2_header(i).map(|x| (x.0, ESPData::IKE(x.1)))
     } else {
@@ -46,18 +45,16 @@ pub fn parse_esp_encapsulated<'a>(i: &'a[u8]) -> IResult<&'a[u8],ESPData<'a>> {
 /// - the payload data (which can be encrypted)
 ///
 /// *Note: input is entirely consumed*
-pub fn parse_esp_header<'a>(i: &'a[u8]) -> IResult<&'a[u8],ESPHeader<'a>> {
+pub fn parse_esp_header<'a>(i: &'a [u8]) -> IResult<&'a [u8], ESPHeader<'a>> {
     do_parse!(
         i,
-        spi_index:  take!(4) >>
-        seq:        be_u32 >>
-        data:       rest >>
-        (
-            ESPHeader{
+        spi_index: take!(4)
+            >> seq: be_u32
+            >> data: rest
+            >> (ESPHeader {
                 spi_index: spi_index,
                 seq: seq,
                 data: data
-            }
-        )
+            })
     )
 }