Skip to content

Commit

Permalink
Use extension crate instead of trussed-staging
Browse files Browse the repository at this point in the history
This patch adapts to the extraction of extension crates from
trussed-staging, see:
        trussed-dev/trussed-staging#19
  • Loading branch information
robin-nitrokey committed Mar 15, 2024
1 parent d0a603e commit 28b7456
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 4 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Changelog

## Unreleased

- Use `trussed-chunked` instead of `trussed-staging`, see
[trussed-staging#19][].

[trussed-staging#19]: https://github.com/trussed-dev/trussed-staging/pull/19

## [v0.3.4][] (2024-01-02)

- Fix error when changing the PUK ([#40][])
Expand Down
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ vpicc = { version = "0.1.0", optional = true }
log = "0.4"
heapless-bytes = "0.3.0"
subtle = { version = "2", default-features = false }
trussed-chunked = "0.1.0"
trussed-rsa-alloc = { version = "0.1.0", features = ["raw"], optional = true }
trussed-staging = { version = "0.1.0", features = ["chunked", "encrypted-chunked"]}

[dev-dependencies]
littlefs2 = "0.3.2"
Expand Down Expand Up @@ -77,8 +77,8 @@ log-error = []
[patch.crates-io]
trussed = { git = "https://github.com/nitrokey/trussed" , tag = "v0.1.0-nitrokey.11" }
trussed-auth = { git = "https://github.com/trussed-dev/trussed-auth.git", tag = "v0.2.2"}
trussed-chunked = { git = "https://github.com/trussed-dev/trussed-staging.git", tag = "chunked-v0.1.0" }
trussed-rsa-alloc = { git = "https://github.com/trussed-dev/trussed-rsa-backend.git", tag = "v0.1.0"}
trussed-staging = { git = "https://github.com/trussed-dev/trussed-staging", tag = "v0.1.0" }
apdu-dispatch = { git = "https://github.com/Nitrokey/apdu-dispatch", tag = "v0.1.2-nitrokey.2" }
trussed-usbip = { git = "https://github.com/Nitrokey/pc-usbip-runner.git", tag = "v0.0.1-nitrokey.1" }
usbd-ccid = { git = "https://github.com/Nitrokey/usbd-ccid", tag = "v0.2.0-nitrokey.1" }
Expand Down
2 changes: 1 addition & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ pub mod state;
mod tlv;

pub use piv_types::{AsymmetricAlgorithms, Pin, Puk};
use trussed_staging::streaming::ChunkedClient;
use trussed_chunked::ChunkedClient;

#[cfg(feature = "virt")]
pub mod virt;
Expand Down
2 changes: 1 addition & 1 deletion src/state.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ use trussed::{
syscall, try_syscall,
types::{KeyId, KeySerialization, Location, Mechanism, PathBuf, StorageAttributes},
};
use trussed_staging::streaming::utils;
use trussed_chunked::utils;

use crate::piv_types::CardHolderUniqueIdentifier;
use crate::reply::Reply;
Expand Down

0 comments on commit 28b7456

Please sign in to comment.