Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove obsolete trussed-staging dependency #18

Merged
merged 1 commit into from
Mar 15, 2024
Merged

Remove obsolete trussed-staging dependency #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 15 additions & 9 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 6 additions & 5 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ apdu-dispatch = "0.1"
trussed = "0.1.0"
pretty_env_logger = { version = "0.4.0", optional = true }
trussed-rsa-alloc = { version = "0.1.0", optional = true }
trussed-staging = { version = "0.1.0"}

# For hmacsha256p256
hmac = { version = "0.12", default-features = false, optional = true}
Expand All @@ -42,6 +41,8 @@ clap-num = "1.0.0"
delog = { version = "0.1.6", features = ["std-log"] }
fido-authenticator = {version = "0.1.1", features = ["dispatch", "log-all"]}
trussed-hkdf = { version = "0.1.0" }
trussed-manage = { version = "0.1.0" }
trussed-staging = { version = "0.2.0" }
trussed-usbip = { version = "0.0.1", features = ["ctaphid"], default-features = false }
admin-app = { version = "0.1", features = ["log-all"] }

Expand All @@ -66,7 +67,7 @@ apdu-peek = []

# Support P256 key derivation from HMAC
# Uses custom backend extension
hmacsha256p256 = ["hmac", "sha2"]
hmacsha256p256 = ["trussed/serde-extensions", "hmac", "sha2"]

# Allow to inject raw key data with specified type into the Trussed key store. Needed for OpenPGP support to use Kind::P256.
# Uses custom backend extension
Expand Down Expand Up @@ -95,7 +96,7 @@ ctaphid-dispatch = { git = "https://github.com/Nitrokey/ctaphid-dispatch", tag =
#apdu-dispatch = { git = "https://github.com/Nitrokey/apdu-dispatch.git", branch="sz-multiple-apps" }

# forked
admin-app = { git = "https://github.com/Nitrokey/admin-app.git", tag = "v0.1.0-nitrokey.8" }
admin-app = { git = "https://github.com/Nitrokey/admin-app.git", tag = "v0.1.0-nitrokey.11" }
fido-authenticator = { git = "https://github.com/Nitrokey/fido-authenticator.git", tag = "v0.1.1-nitrokey.11" }
serde-indexed = { git = "https://github.com/sosthene-nitrokey/serde-indexed.git", rev = "5005d23cb4ee8622e62188ea0f9466146f851f0d" }

Expand All @@ -109,12 +110,12 @@ usbd-ctaphid = { git = "https://github.com/Nitrokey/usbd-ctaphid", tag = "v0.1.0

# unreleased crates
trussed-auth = { git = "https://github.com/trussed-dev/trussed-auth", rev = "62235294bd63977bbb88eb01e7ac44b8010eb450" }
trussed-manage = { git = "https://github.com/trussed-dev/trussed-staging.git", tag = "manage-v0.1.0" }
trussed-hkdf = { git = "https://github.com/Nitrokey/trussed-hkdf-backend.git", tag = "v0.1.0" }
trussed-rsa-alloc = { git = "https://github.com/trussed-dev/trussed-rsa-backend.git", rev = "2f51478f0861ff8db19fdd5290f023ab6f4c2fb9" }
trussed-staging = { git = "https://github.com/trussed-dev/trussed-staging.git", tag = "v0.2.0" }
trussed-usbip = { git = "https://github.com/Nitrokey/pc-usbip-runner", tag = "v0.0.1-nitrokey.1" }
trussed-staging = { git = "https://github.com/Nitrokey/trussed-staging.git", rev = "6e70fc4db31b92c413d56e28c6d3683a87384d46" }

# Local development
#trussed = { path = "../trussed" }
#trussed-rsa-alloc = { path = "../trussed-rsa-backend" }
#trussed-staging = { path = "../trussed-staging" }
4 changes: 2 additions & 2 deletions examples/usbip/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const LOCATION_FOR_SIMULATION: Location = Location::Internal;

mod dispatch {
use trussed_hkdf::HkdfExtension;
use trussed_staging::manage::ManageExtension;
use trussed_manage::ManageExtension;
use trussed_staging::StagingBackend;
use trussed_staging::StagingContext;
use webcrypt::hmacsha256p256::HmacSha256P256Extension;
Expand Down Expand Up @@ -459,7 +459,7 @@ impl trussed_usbip::Apps<'static, VirtClient, dispatch::Dispatch> for Apps {
},
);
let data = AdminData::new(Variant::Usbip);
let admin = admin_app::App::without_config(
let admin = admin_app::App::with_default_config(
builder.build("admin", &[BackendId::Core]),
[0; 16],
0,
Expand Down
Loading