Skip to content

Commit

Permalink
Update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
@robin-nitrokey
robin-nitrokey committed Aug 13, 2024
1 parent be90303 commit b2e3dd1
Show file tree
Hide file tree
Showing 13 changed files with 83 additions and 75 deletions.
60 changes: 31 additions & 29 deletions Cargo.lock
View file

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

31 changes: 19 additions & 12 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,36 +17,43 @@ version = "1.7.2"
memory-regions = { path = "components/memory-regions" }

# forked
admin-app = { git = "https://github.com/Nitrokey/admin-app.git", tag = "v0.1.0-nitrokey.13" }
admin-app = { git = "https://github.com/Nitrokey/admin-app.git", branch = "littlefs2" }
cbor-smol = { git = "https://github.com/Nitrokey/cbor-smol.git", tag = "v0.4.0-nitrokey.3"}
fido-authenticator = { git = "https://github.com/Nitrokey/fido-authenticator.git", tag = "v0.1.1-nitrokey.16" }
fido-authenticator = { git = "https://github.com/Nitrokey/fido-authenticator.git", branch = "littlefs2" }
lpc55-hal = { git = "https://github.com/Nitrokey/lpc55-hal", tag = "v0.3.0-nitrokey.2" }
trussed = { git = "https://github.com/nitrokey/trussed.git", tag = "v0.1.0-nitrokey.21" }
# trussed = { git = "https://github.com/Nitrokey/trussed.git", tag = "v0.1.0-nitrokey.21" }
trussed = { git = "https://github.com/trussed-dev/trussed.git", branch = "littlefs2" }

# unreleased upstream changes
apdu-dispatch = { git = "https://github.com/Nitrokey/apdu-dispatch.git", tag = "v0.1.2-nitrokey.3" }
ctaphid-dispatch = { git = "https://github.com/Nitrokey/ctaphid-dispatch.git", tag = "v0.1.1-nitrokey.3" }
littlefs2 = { git = "https://github.com/trussed-dev/littlefs2.git", rev = "960e57d9fc0d209308c8e15dc26252bbe1ff6ba8" }
littlefs2-sys = { git = "https://github.com/trussed-dev/littlefs2-sys.git", rev = "39626c0dbc2f6c38b74889a5bf9d5a200614f121" }
littlefs2 = { git = "https://github.com/trussed-dev/littlefs2.git", branch = "core" }
littlefs2-core = { git = "https://github.com/trussed-dev/littlefs2.git", branch = "core" }
littlefs2-sys = { git = "https://github.com/trussed-dev/littlefs2-sys.git", tag = "0.2.0" }
usbd-ctaphid = { git = "https://github.com/trussed-dev/usbd-ctaphid.git", rev = "dcff9009c3cd1ef9e5b09f8f307aca998fc9a8c8" }
usbd-ccid = { git = "https://github.com/Nitrokey/usbd-ccid", tag = "v0.2.0-nitrokey.1" }
p256-cortex-m4 = { git = "https://github.com/ycrypto/p256-cortex-m4.git", rev = "cdb31e12594b4dc1f045b860a885fdc94d96aee2" }

# unreleased crates
secrets-app = { git = "https://github.com/Nitrokey/trussed-secrets-app", tag = "v0.13.0" }
webcrypt = { git = "https://github.com/nitrokey/nitrokey-websmartcard-rust", tag = "v0.8.0-rc8" }
opcard = { git = "https://github.com/Nitrokey/opcard-rs", tag = "v1.5.0" }
piv-authenticator = { git = "https://github.com/Nitrokey/piv-authenticator.git", tag = "v0.3.7" }
secrets-app = { git = "https://github.com/Nitrokey/trussed-secrets-app", branch = "littlefs2" }
webcrypt = { git = "https://github.com/nitrokey/nitrokey-websmartcard-rust", branch = "littlefs2" }
# opcard = { git = "https://github.com/Nitrokey/opcard-rs", tag = "v1.5.0" }
opcard = { git = "https://github.com/Nitrokey/opcard-rs", branch = "littlefs2" }
# piv-authenticator = { git = "https://github.com/Nitrokey/piv-authenticator.git", tag = "v0.3.7" }
piv-authenticator = { git = "https://github.com/trussed-dev/piv-authenticator.git", branch = "littlefs2" }
trussed-chunked = { git = "https://github.com/trussed-dev/trussed-staging.git", tag = "chunked-v0.1.0" }
trussed-manage = { git = "https://github.com/trussed-dev/trussed-staging.git", tag = "manage-v0.1.0" }
trussed-wrap-key-to-file = { git = "https://github.com/trussed-dev/trussed-staging.git", tag = "wrap-key-to-file-v0.1.0" }
trussed-staging = { git = "https://github.com/trussed-dev/trussed-staging.git", tag = "v0.3.0" }
trussed-auth = { git = "https://github.com/trussed-dev/trussed-auth", rev = "947ffe6cff426ccbbbb2d0f689437f427665919e" }
# trussed-staging = { git = "https://github.com/trussed-dev/trussed-staging.git", tag = "v0.3.0" }
trussed-staging = { git = "https://github.com/trussed-dev/trussed-staging.git", branch = "littlefs2" }
# trussed-auth = { git = "https://github.com/trussed-dev/trussed-auth", rev = "947ffe6cff426ccbbbb2d0f689437f427665919e" }
trussed-auth = { git = "https://github.com/trussed-dev/trussed-auth", branch = "littlefs2" }
trussed-hkdf = { git = "https://github.com/trussed-dev/trussed-staging.git", tag = "hkdf-v0.2.0" }
trussed-rsa-alloc = { git = "https://github.com/trussed-dev/trussed-rsa-backend.git", tag = "v0.2.1" }
trussed-usbip = { git = "https://github.com/Nitrokey/pc-usbip-runner.git", tag = "v0.0.1-nitrokey.4" }
trussed-se050-manage = { git = "https://github.com/Nitrokey/trussed-se050-backend.git", tag = "se050-manage-v0.1.0" }
trussed-se050-backend = { git = "https://github.com/Nitrokey/trussed-se050-backend.git", tag = "v0.3.4" }
# trussed-se050-backend = { git = "https://github.com/Nitrokey/trussed-se050-backend.git", tag = "v0.3.4" }
trussed-se050-backend = { git = "https://github.com/Nitrokey/trussed-se050-backend.git", branch = "littlefs2" }

[profile.release]
codegen-units = 1
Expand Down
2 changes: 1 addition & 1 deletion components/apps/src/dispatch.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ fn should_preserve_file(file: &Path) -> bool {

let mut components = file.iter();
if_chain! {
if components.next() == Some("/".into());
if components.next().as_deref() == Some(path!("/"));
if components.next().is_some();
if let Some(intermediary) = components.next();
if DIRS.contains(&&*intermediary);
Expand Down
28 changes: 14 additions & 14 deletions components/apps/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@ impl<R: Runner> Apps<R> {
trussed_service: &mut Service<P, Dispatch<R::Twi, R::Se050Timer>>,
mut make_client: impl FnMut(
&mut Service<P, Dispatch<R::Twi, R::Se050Timer>>,
&'static str,
&'static Path,
&'static [BackendId<Backend>],
Option<&'static InterruptFlag>,
) -> Client<R>,
Expand Down Expand Up @@ -417,7 +417,7 @@ impl<R: Runner> Apps<R> {
trussed_service: &mut Service<P, Dispatch<R::Twi, R::Se050Timer>>,
make_client: impl FnOnce(
&mut Service<P, Dispatch<R::Twi, R::Se050Timer>>,
&'static str,
&'static Path,
&'static [BackendId<Backend>],
Option<&'static InterruptFlag>,
) -> Client<R>,
Expand Down Expand Up @@ -549,7 +549,7 @@ impl<R: Runner> Apps<R> {
runner,
trussed_service,
|trussed_service, id, backends, interrupt| {
ClientBuilder::new(id)
ClientBuilder::new(id.into())
.backends(backends)
.interrupt(interrupt)
.prepare(trussed_service)
Expand Down Expand Up @@ -684,12 +684,12 @@ trait App<R: Runner>: Sized {
type Config;

/// the desired client ID
const CLIENT_ID: &'static str;
const CLIENT_ID: &'static Path;

fn new(
runner: &R,
make_client: impl FnOnce(
&'static str,
&'static Path,
&'static [BackendId<Backend>],
Option<&'static InterruptFlag>,
) -> Client<R>,
Expand All @@ -703,7 +703,7 @@ trait App<R: Runner>: Sized {
fn client(
runner: &R,
make_client: impl FnOnce(
&'static str,
&'static Path,
&'static [BackendId<Backend>],
Option<&'static InterruptFlag>,
) -> Client<R>,
Expand Down Expand Up @@ -828,10 +828,10 @@ impl<R: Runner> AdminData<R> {
}
}

const ADMIN_APP_CLIENT_ID: &str = "admin";
const ADMIN_APP_CLIENT_ID: &Path = path!("admin");

impl<R: Runner> App<R> for AdminApp<R> {
const CLIENT_ID: &'static str = ADMIN_APP_CLIENT_ID;
const CLIENT_ID: &'static Path = ADMIN_APP_CLIENT_ID;

type Data = AdminData<R>;
type Config = ();
Expand Down Expand Up @@ -866,7 +866,7 @@ pub struct FidoData {

#[cfg(feature = "fido-authenticator")]
impl<R: Runner> App<R> for FidoApp<R> {
const CLIENT_ID: &'static str = "fido";
const CLIENT_ID: &'static Path = path!("fido");

type Data = FidoData;
type Config = FidoConfig;
Expand Down Expand Up @@ -909,7 +909,7 @@ impl<R: Runner> App<R> for FidoApp<R> {

#[cfg(feature = "webcrypt")]
impl<R: Runner> App<R> for WebcryptApp<R> {
const CLIENT_ID: &'static str = "webcrypt";
const CLIENT_ID: &'static Path = path!("webcrypt");

type Data = ();
type Config = ();
Expand Down Expand Up @@ -939,7 +939,7 @@ impl<R: Runner> App<R> for WebcryptApp<R> {

#[cfg(feature = "secrets-app")]
impl<R: Runner> App<R> for SecretsApp<R> {
const CLIENT_ID: &'static str = "secrets";
const CLIENT_ID: &'static Path = path!("secrets");

type Data = ();
type Config = ();
Expand Down Expand Up @@ -972,7 +972,7 @@ static OPCARD_RESET_SIGNAL: ResetSignalAllocation = ResetSignalAllocation::new()

#[cfg(feature = "opcard")]
impl<R: Runner> App<R> for OpcardApp<R> {
const CLIENT_ID: &'static str = "opcard";
const CLIENT_ID: &'static Path = path!("opcard");

type Data = ();
type Config = OpcardConfig;
Expand Down Expand Up @@ -1038,7 +1038,7 @@ impl<R: Runner> App<R> for OpcardApp<R> {

#[cfg(feature = "piv-authenticator")]
impl<R: Runner> App<R> for PivApp<R> {
const CLIENT_ID: &'static str = "piv";
const CLIENT_ID: &'static Path = path!("piv");

type Data = ();
type Config = ();
Expand Down Expand Up @@ -1075,7 +1075,7 @@ pub struct ProvisionerData<R: Runner> {

#[cfg(feature = "provisioner-app")]
impl<R: Runner> App<R> for ProvisionerApp<R> {
const CLIENT_ID: &'static str = "attn";
const CLIENT_ID: &'static Path = path!("attn");

type Data = ProvisionerData<R>;
type Config = ();
Expand Down
Loading

0 comments on commit b2e3dd1

Please sign in to comment.