Skip to content

Commit

Permalink
Use renamed RSA backend
Browse files Browse the repository at this point in the history
  • Loading branch information
sosthene-nitrokey committed Feb 16, 2023
1 parent 7e3225d commit 3001a6f
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 10 deletions.
8 changes: 4 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ log = "0.4"
serde = { version = "1.0", default-features = false }
subtle = { version = "2.4.1", default-features = false }
trussed = "0.1.0"
trussed-rsa-backend = { git = "https://github.com/Nitrokey/trussed-rsa-backend", optional = true }
trussed-rsa-alloc = { git = "https://github.com/Nitrokey/trussed-rsa-backend", rev = "a39ceceeb6c5faecec567d6b1b2ed3d456951c07", optional = true }
serde_repr = "0.1"
hex-literal = "0.3.4"

Expand All @@ -46,7 +46,7 @@ regex = "1.6.0"
stoppable_thread = "0.2.1"
test-log = "0.2.10"
trussed = { version = "0.1.0", features = ["virt"] }
trussed-rsa-backend = { git = "https://github.com/Nitrokey/trussed-rsa-backend", features = ["virt"] }
trussed-rsa-alloc = { git = "https://github.com/Nitrokey/trussed-rsa-backend", rev = "a39ceceeb6c5faecec567d6b1b2ed3d456951c07", features = ["virt"] }
rand = "0.8.5"
ron = "0.8"
serde_cbor = "0.11"
Expand All @@ -55,7 +55,7 @@ hex = { version = "0.4", features = ["serde"] }
[features]
std = []
virtual = ["std", "vpicc"]
rsa = ["trussed-rsa-backend"]
rsa = ["trussed-rsa-alloc"]
rsa2048 = ["rsa"]
rsa4096 = ["rsa2048"]
rsa4096-gen = ["rsa4096"]
Expand All @@ -72,7 +72,7 @@ log-error = []
[patch.crates-io]
interchange = { git = "https://github.com/trussed-dev/interchange", rev = "fe5633466640e1e9a8c06d9b5dd1d0af08c272af" }
p256-cortex-m4 = { git = "https://github.com/Nitrokey/p256-cortex-m4", tag = "v0.1.0-alpha.6-nitrokey-1" }
trussed = { git = "https://github.com/trussed-dev/trussed" , rev = "51477a4c5d22b7fbfe9d5fed137701764b2c86ec" }
trussed = { git = "https://github.com/trussed-dev/trussed" , rev = "67b4ee9c6c530658e2a358a082cbf8720e896bc1" }

[package.metadata.docs.rs]
all-features = true
Expand Down
2 changes: 1 addition & 1 deletion examples/virtual.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#[cfg(not(feature = "rsa"))]
use trussed::virt::with_ram_client;
#[cfg(feature = "rsa")]
use trussed_rsa_backend::virt::with_ram_client;
use trussed_rsa_alloc::virt::with_ram_client;

fn main() {
env_logger::init();
Expand Down
2 changes: 1 addition & 1 deletion src/command/gen.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ use crate::utils::InspectErr;
const KEYGEN_DO_TAG: &[u8] = &hex!("7f49");

#[cfg(feature = "rsa")]
use trussed_rsa_backend::RsaPublicParts;
use trussed_rsa_alloc::RsaPublicParts;

fn serialize_pub<const R: usize, T: trussed::Client>(
algo: CurveAlgo,
Expand Down
2 changes: 1 addition & 1 deletion src/command/private_key_template.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const PRIVATE_KEY_TEMPLATE_DO: u16 = 0x4D;
const CONCATENATION_KEY_DATA_DO: u16 = 0x5F48;

#[cfg(feature = "rsa")]
use trussed_rsa_backend::RsaImportFormat;
use trussed_rsa_alloc::RsaImportFormat;

// § 4.4.3.12
pub fn put_private_key_template<const R: usize, T: trussed::Client>(
Expand Down
2 changes: 1 addition & 1 deletion tests/card/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ use trussed::{
#[cfg(not(feature = "rsa"))]
use trussed::virt::{with_ram_client, Client};
#[cfg(feature = "rsa")]
use trussed_rsa_backend::virt::{with_ram_client, Client};
use trussed_rsa_alloc::virt::{with_ram_client, Client};

const REQUEST_LEN: usize = 7609;
const RESPONSE_LEN: usize = 7609;
Expand Down
2 changes: 1 addition & 1 deletion tests/command-response.rs
Original file line number Diff line number Diff line change
Expand Up @@ -715,7 +715,7 @@ impl IoCmd {
#[cfg(not(feature = "rsa"))]
use trussed::virt::with_ram_client;
#[cfg(feature = "rsa")]
use trussed_rsa_backend::virt::with_ram_client;
use trussed_rsa_alloc::virt::with_ram_client;

#[test_log::test]
fn command_response() {
Expand Down
2 changes: 1 addition & 1 deletion tests/virt/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ use stoppable_thread::spawn;
#[cfg(not(feature = "rsa"))]
use trussed::virt::with_ram_client;
#[cfg(feature = "rsa")]
use trussed_rsa_backend::virt::with_ram_client;
use trussed_rsa_alloc::virt::with_ram_client;

const STDOUT_FILTER: &[&str] = &[
r"\[GNUPG:\] KEY_CONSIDERED [0-9A-F]{40} \d",
Expand Down

0 comments on commit 3001a6f

Please sign in to comment.