openpgp: Make SKESK4::esk fail with unknown S2K.

1 files changed, 2 insertions, 5 deletions

diff --git a/openpgp/src/serialize.rs b/openpgp/src/serialize.rs
index a9fa5385..99e689bc 100644
--- a/openpgp/src/serialize.rs
+++ b/openpgp/src/serialize.rs
@@ -2313,10 +2313,7 @@ impl Marshal for SKESK4 {
         write_byte(o, 4)?; // Version.
         write_byte(o, self.symmetric_algo().into())?;
         self.s2k().serialize(o)?;
-        if let Some(ref esk) = self.esk()? {
-            o.write_all(&esk[..])?;
-        }
-
+        o.write_all(self.raw_esk())?;
         Ok(())
     }
 }
@@ -2326,7 +2323,7 @@ impl NetLength for SKESK4 {
         1 // Version.
             + 1 // Algo.
             + self.s2k().serialized_len()
-            + self.esk().unwrap().map(|esk| esk.len()).unwrap_or(0)
+            + self.raw_esk().len()
     }
 }