Update to heapless 0.9

Author: sosthene-nitrokey

Cargo.toml

@@ -11,7 +11,7 @@ license = "Apache-2.0 OR MIT"
 repository = "https://github.com/trussed-dev/trussed-rsa-backend"
 
 [workspace.dependencies]
-heapless-bytes = "0.3"
+heapless-bytes = "0.5"
 trussed-core = "0.1"
 
 [package]
@@ -32,7 +32,7 @@ num-bigint-dig = { version = "0.8.2", default-features = false }
 rsa = { version = "0.9", default-features = false, features = ["sha2"]}
 
 trussed = { version = "0.1", default-features = false }
-trussed-core = { workspace = true, features = ["crypto-client", "rsa2048", "rsa3072", "rsa4096"] }
+trussed-core.workspace = true
 trussed-rsa-types = "0.1"
 
 [dev-dependencies]
@@ -42,7 +42,7 @@ delog = { version = "0.1.6", features = ["std-log"] }
 test-log = "0.2.11"
 env_logger = "0.10.0"
 rand = "0.8.5"
-trussed = { version = "0.1", default-features = false, features = ["certificate-client", "clients-1", "crypto-client"] }
+trussed = { version = "0.1", default-features = false, features = ["clients-1"] }
 
 [features]
 

src/crypto_traits.rs

@@ -6,10 +6,10 @@ use trussed_core::{
         reply,
         request::{DeserializeKey, UnsafeInjectKey},
     },
+    client::{ClientError, ClientResult, CryptoClient},
     types::{
         KeyId, KeySerialization, Location, Mechanism, SignatureSerialization, StorageAttributes,
     },
-    ClientError, ClientResult, CryptoClient,
 };
 use trussed_rsa_types::{RsaImportFormat, RsaPublicParts};
 

src/lib.rs

@@ -270,7 +270,7 @@ fn sign(
         Error::InternalError
     })?;
     let our_signature =
-        Signature::from_slice(&native_signature.to_bytes()).unwrap_or_else(|_| panic!());
+        Signature::try_from(&*native_signature.to_bytes()).unwrap_or_else(|_| panic!());
 
     Ok(reply::Sign {
         signature: our_signature,
@@ -337,7 +337,7 @@ fn decrypt(
         })?;
 
     Ok(reply::Decrypt {
-        plaintext: Some(Bytes::from_slice(&res).map_err(|_| {
+        plaintext: Some(Bytes::try_from(&*res).map_err(|_| {
             error!("Failed type conversion");
             Error::InternalError
         })?),

types/src/lib.rs

@@ -25,6 +25,16 @@ pub struct Error {
     kind: ErrorKind,
 }
 
+pub(crate) fn postcard_serialize_bytes<T: serde::Serialize, const N: usize>(
+    object: &T,
+) -> postcard::Result<Bytes<N>> {
+    let mut vec = Bytes::new();
+    vec.resize_to_capacity();
+    let serialized = postcard::to_slice(object, &mut vec)?.len();
+    vec.resize(serialized, 0).unwrap();
+    Ok(vec)
+}
+
 /// Structure containing the public part of an RSA key
 ///
 /// Given how Trussed extensions are implemented, this structure cannot be sent as-is to the backend,
@@ -42,15 +52,14 @@ pub struct RsaPublicParts<'d> {
 impl<'d> RsaPublicParts<'d> {
     pub fn serialize(&self) -> Result<SerializedKey, Error> {
         use postcard::Error as PError;
-        let vec = postcard::to_vec(self).map_err(|err| match err {
+        Ok(postcard_serialize_bytes(self).map_err(|err| match err {
             PError::SerializeBufferFull => Error {
                 kind: ErrorKind::SerializeBufferFull,
             },
             _ => Error {
                 kind: ErrorKind::SerializeCustom,
             },
-        })?;
-        Ok(Bytes::from(vec))
+        })?)
     }
 
     pub fn deserialize(data: &'d [u8]) -> Result<Self, Error> {
@@ -79,15 +88,14 @@ pub struct RsaImportFormat<'d> {
 impl<'d> RsaImportFormat<'d> {
     pub fn serialize(&self) -> Result<SerializedKey, Error> {
         use postcard::Error as PError;
-        let vec = postcard::to_vec(self).map_err(|err| match err {
+        Ok(postcard_serialize_bytes(self).map_err(|err| match err {
             PError::SerializeBufferFull => Error {
                 kind: ErrorKind::SerializeBufferFull,
             },
             _ => Error {
                 kind: ErrorKind::SerializeCustom,
             },
-        })?;
-        Ok(Bytes::from(vec))
+        })?)
     }
 
     pub fn deserialize(data: &'d [u8]) -> Result<Self, Error> {