Merge pull request #472 from nak3/fix-pem2.0

chore: bump pem from 1.1.1 to 2.0.1

Author: mergify[bot]

Cargo.lock

@@ -22,7 +22,7 @@ uuid = "1.3"
 num-traits = "0.2"
 num-derive = "0.3"
 paste = "1.0"
-pem = "1.1"
+pem = "2.0"
 tss-esapi = "7.2"
 
 http = "0.2"

data-formats/Cargo.toml

@@ -176,20 +176,20 @@ impl OwnershipVoucher {
 
     pub fn from_pem(data: &[u8]) -> Result<Self> {
         let parsed = pem::parse(data)?;
-        if parsed.tag != VOUCHER_PEM_TAG {
-            return Err(Error::InvalidPemTag(parsed.tag));
+        if parsed.tag() != VOUCHER_PEM_TAG {
+            return Err(Error::InvalidPemTag(parsed.tag().to_string()));
         }
-        Self::deserialize_data(&parsed.contents)
+        Self::deserialize_data(parsed.contents())
     }
 
     pub fn many_from_pem(data: &[u8]) -> Result<Vec<Self>> {
         pem::parse_many(data)?
             .into_iter()
             .map(|parsed| {
-                if parsed.tag == VOUCHER_PEM_TAG {
-                    Self::deserialize_from_reader(&*parsed.contents)
+                if parsed.tag() == VOUCHER_PEM_TAG {
+                    Self::deserialize_from_reader(parsed.contents())
                 } else {
-                    Err(Error::InvalidPemTag(parsed.tag))
+                    Err(Error::InvalidPemTag(parsed.tag().to_string()))
                 }
             })
             .collect()
@@ -204,10 +204,7 @@ impl OwnershipVoucher {
     }
 
     pub fn to_pem(&self) -> Result<String> {
-        let block = pem::Pem {
-            tag: VOUCHER_PEM_TAG.to_string(),
-            contents: self.serialize_data()?,
-        };
+        let block = pem::Pem::new(VOUCHER_PEM_TAG.to_string(), self.serialize_data()?);
         Ok(pem::encode(&block))
     }
 

data-formats/src/ownershipvoucher.rs

@@ -33,7 +33,7 @@ serde_json = "1.0"
 pretty_assertions = "1.0.0"
 paste = "1.0"
 passwd = "0.0.1"
-pem = "1.1"
+pem = "2.0"
 users = "0.11.0"
 
 fdo-data-formats = { path = "../data-formats" }

integration-tests/Cargo.toml

@@ -66,7 +66,7 @@ fn test_multiple_vouchers_raw() -> Result<()> {
             count += 1;
 
             let pemblock = pem::parse(&voucher).context("Error parsing OV PEM")?;
-            buffer.extend_from_slice(&pemblock.contents);
+            buffer.extend_from_slice(pemblock.contents());
 
             Ok(buffer)
         })?;