diff --git a/Cargo.toml b/Cargo.toml index 48a0db5..ba9609b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -34,7 +34,7 @@ vpicc = { version = "0.1.0", optional = true } log = "0.4" heapless-bytes = "0.3.0" subtle = { version = "2", default-features = false } -trussed-rsa-alloc = { git = "https://github.com/Nitrokey/trussed-rsa-backend.git", rev = "a39ceceeb6c5faecec567d6b1b2ed3d456951c07" } +trussed-rsa-alloc = { git = "https://github.com/Nitrokey/trussed-rsa-backend.git", rev = "e29b26ab3800217b7eb73ecde67134bbb3acb9da", features = ["raw"] } [dev-dependencies] littlefs2 = "0.3.2" @@ -60,7 +60,7 @@ rand = "0.8.5" default = [] strict-pin = [] std = [] -virtual = ["std", "vpicc", "trussed/virt"] +virtual = ["std", "vpicc", "trussed-rsa-alloc/virt"] pivy-tests = [] opensc-tests = [] diff --git a/examples/virtual.rs b/examples/virtual.rs index b5cd4f7..4f20b27 100644 --- a/examples/virtual.rs +++ b/examples/virtual.rs @@ -14,7 +14,7 @@ fn main() { env_logger::init(); - trussed::virt::with_ram_client("piv-authenticator", |client| { + trussed_rsa_alloc::virt::with_ram_client("piv-authenticator", |client| { let card = piv_authenticator::Authenticator::new(client); let mut virtual_card = piv_authenticator::vpicc::VirtualCard::new(card); let vpicc = vpicc::connect().expect("failed to connect to vpicc"); diff --git a/src/vpicc.rs b/src/vpicc.rs index 989a18d..e7b82bb 100644 --- a/src/vpicc.rs +++ b/src/vpicc.rs @@ -2,7 +2,8 @@ // SPDX-License-Identifier: LGPL-3.0-only use iso7816::{command::FromSliceError, Command, Status}; -use trussed::virt::{Client, Ram}; +use trussed::virt::Ram; +use trussed_rsa_alloc::virt::Client; use std::convert::{TryFrom, TryInto}; diff --git a/tests/card/mod.rs b/tests/card/mod.rs index 2f23146..de845ae 100644 --- a/tests/card/mod.rs +++ b/tests/card/mod.rs @@ -17,7 +17,7 @@ pub fn with_vsc R, R>(f: F) -> R { let (tx, rx) = mpsc::channel(); let handle = spawn(move |stopped| { - trussed::virt::with_ram_client("opcard", |client| { + trussed_rsa_alloc::virt::with_ram_client("opcard", |client| { let card = Authenticator::new(client); let mut virtual_card = VirtualCard::new(card); let mut result = Ok(()); diff --git a/tests/setup/mod.rs b/tests/setup/mod.rs index 91b9391..d559ced 100644 --- a/tests/setup/mod.rs +++ b/tests/setup/mod.rs @@ -11,12 +11,13 @@ macro_rules! cmd { }; } -use trussed::virt::{Client, Ram}; +use trussed::virt::Ram; +use trussed_rsa_alloc::virt::Client; pub type Piv = piv_authenticator::Authenticator>; pub fn piv(test: impl FnOnce(&mut Piv) -> R) -> R { - trussed::virt::with_ram_client("test", |client| { + trussed_rsa_alloc::virt::with_ram_client("test", |client| { let mut piv_app = piv_authenticator::Authenticator::new(client); test(&mut piv_app) })