Replace trussed dependency with trussed-core

Author: robin-nitrokey

Cargo.toml

@@ -13,13 +13,12 @@ categories = ["embedded", "no-std"]
 ctaphid-dispatch = "0.1.0"
 embedded-time = "0.12"
 delog = "0.1.0"
-heapless = "0.7"
 heapless-bytes = "0.3"
 interchange = "0.3.0"
 serde = { version = "1.0", default-features = false }
 usb-device = "0.2.3"
 ref-swap = "0.1.2"
-trussed = "0.1.0"
+trussed-core = "0.1.0-rc.1"
 
 
 [features]
@@ -33,5 +32,4 @@ log-warn = []
 log-error = []
 
 [patch.crates-io]
-ctaphid-dispatch = { git = "https://github.com/trussed-dev/ctaphid-dispatch.git", rev = "57cb3317878a8593847595319aa03ef17c29ec5b" }
-trussed = { git = "https://github.com/trussed-dev/trussed.git", rev = "51e68500d7601d04f884f5e95567d14b9018a6cb" }
+ctaphid-dispatch = { git = "https://github.com/trussed-dev/ctaphid-dispatch.git", rev = "5a2864c76fea6785d9ffe4c7b6596237d8378755" }

src/class.rs

@@ -3,7 +3,7 @@
 
 use embedded_time::duration::Extensions;
 use ref_swap::OptionRefSwap;
-use trussed::interrupt::InterruptFlag;
+use trussed_core::InterruptFlag;
 
 use crate::{
     constants::{INTERRUPT_POLL_MILLISECONDS, PACKET_SIZE},

src/pipe.rs

@@ -20,10 +20,9 @@ use core::sync::atomic::Ordering;
 
 use ctaphid_dispatch::command::Command;
 use ctaphid_dispatch::types::Requester;
-
-use trussed::interrupt::InterruptFlag;
-
+use heapless_bytes::Bytes;
 use ref_swap::OptionRefSwap;
+use trussed_core::InterruptFlag;
 // use serde::Serialize;
 use usb_device::{
     bus::UsbBus,
@@ -536,7 +535,7 @@ impl<'alloc, 'pipe, 'interrupt, Bus: UsbBus> Pipe<'alloc, 'pipe, 'interrupt, Bus
                 }
                 match self.interchange.request((
                     request.command,
-                    heapless::Vec::from_slice(&self.buffer[..request.length as usize]).unwrap(),
+                    Bytes::from_slice(&self.buffer[..request.length as usize]).unwrap(),
                 )) {
                     Ok(_) => {
                         self.state = State::WaitingOnAuthenticator(request);