Deserialize plain DI certs as raw DER

data-formats/src/cborparser.rs

@@ -5,7 +5,7 @@ use thiserror::Error;
 
 use crate::{
     constants::HashType,
-    serializable::{DeserializableMany, MaybeSerializable},
+    serializable::{private::MaybeSerializable, DeserializableMany},
     types::Hash,
     Error, Serializable,
 };

data-formats/src/lib.rs

@@ -19,7 +19,7 @@ pub mod messages;
 
 pub mod cborparser;
 
-mod serializable;
+pub mod serializable;
 pub use serializable::DeserializableMany;
 pub use serializable::Serializable;
 

data-formats/src/ownershipvoucher.rs

@@ -13,7 +13,7 @@ use crate::{
     constants::HashType,
     errors::Result,
     publickey::{PublicKey, X5Chain},
-    serializable::MaybeSerializable,
+    serializable::private::MaybeSerializable,
     types::{COSESign, Guid, HMac, Hash, RendezvousInfo, UnverifiedValue},
     DeserializableMany, Error, ProtocolVersion, Serializable,
 };

data-formats/src/serializable.rs

@@ -24,28 +24,31 @@ pub trait Serializable {
         W: std::io::Write;
 }
 
-pub trait MaybeSerializable: Serializable {
-    fn is_nodata_error(err: &Error) -> bool;
+/// Some traits that are currently private, as we don't want to commit ourselves to them
+pub(crate) mod private {
+    pub trait MaybeSerializable: super::Serializable {
+        fn is_nodata_error(err: &super::Error) -> bool;
 
-    fn maybe_deserialize_from_reader<R>(reader: R) -> Result<Option<Self>, Error>
-    where
-        Self: Sized,
-        R: std::io::Read,
-    {
-        match Self::deserialize_from_reader(reader) {
-            Ok(value) => Ok(Some(value)),
-            Err(err) => {
-                if Self::is_nodata_error(&err) {
-                    Ok(None)
-                } else {
-                    Err(err)
+        fn maybe_deserialize_from_reader<R>(reader: R) -> Result<Option<Self>, super::Error>
+        where
+            Self: Sized,
+            R: std::io::Read,
+        {
+            match Self::deserialize_from_reader(reader) {
+                Ok(value) => Ok(Some(value)),
+                Err(err) => {
+                    if Self::is_nodata_error(&err) {
+                        Ok(None)
+                    } else {
+                        Err(err)
+                    }
                 }
             }
         }
     }
 }
 
-pub trait DeserializableMany: MaybeSerializable {
+pub trait DeserializableMany: private::MaybeSerializable {
     fn deserialize_many_from_reader<R>(mut reader: R) -> Result<Vec<Self>, Error>
     where
         Self: Sized,
@@ -85,3 +88,34 @@ where
         ciborium::ser::into_writer(self, &mut writer).map_err(Error::from)
     }
 }
+
+/// A structure that wraps a Vec<u8>, which (de)serializes its contents without
+/// any data format. Can be used when some data needs to be read from a file
+/// without expecting a CBOR array.
+/// Note that the deserialize methods will read the entire contents of the buffer/reader.
+/// Do *not* expect to be able to read any other data after using this on a reader.
+#[derive(Debug, Clone)]
+pub struct PlainBytes(pub Vec<u8>);
+
+impl Serializable for PlainBytes {
+    fn deserialize_data(data: &[u8]) -> Result<Self, Error> {
+        Ok(PlainBytes(Vec::from(data)))
+    }
+
+    fn deserialize_from_reader<R>(mut reader: R) -> Result<Self, Error>
+    where
+        Self: Sized,
+        R: std::io::Read,
+    {
+        let mut buffer = Vec::new();
+        reader.read_to_end(&mut buffer).map_err(Error::from)?;
+        Ok(PlainBytes(buffer))
+    }
+
+    fn serialize_to_writer<W>(&self, mut writer: W) -> Result<(), Error>
+    where
+        W: std::io::Write,
+    {
+        writer.write_all(&self.0).map_err(Error::from)
+    }
+}

manufacturing-server/src/handlers/di.rs

@@ -79,7 +79,8 @@ pub(crate) async fn app_start(
             Some(store) => store
                 .load_data(&mfg_info.to_string())
                 .await
-                .map_err(Error::from_error::<messages::v11::di::AppStart, _>)?,
+                .map_err(Error::from_error::<messages::v11::di::AppStart, _>)?
+                .map(|d| d.0),
         },
     };
     let public_key = match public_key {

manufacturing-server/src/main.rs

@@ -17,6 +17,7 @@ use fdo_data_formats::{
     constants::{KeyStorageType, MfgStringType, PublicKeyType, RendezvousVariable},
     ownershipvoucher::OwnershipVoucher,
     publickey::{PublicKey, X5Chain},
+    serializable::PlainBytes,
     types::{Guid, RendezvousInfo},
     ProtocolVersion,
 };
@@ -62,8 +63,9 @@ struct ManufacturingServiceUD {
             OwnershipVoucherStoreMetadataKey,
         >,
     >,
-    public_key_store:
-        Option<Box<dyn Store<fdo_store::ReadOnlyOpen, String, Vec<u8>, PublicKeyStoreMetadataKey>>>,
+    public_key_store: Option<
+        Box<dyn Store<fdo_store::ReadOnlyOpen, String, PlainBytes, PublicKeyStoreMetadataKey>>,
+    >,
 
     // Certificates
     manufacturer_cert: X509,