Skip to content

Commit

Permalink
Update fido-authenticator, ctap-types, ...
Browse files Browse the repository at this point in the history
  • Loading branch information
robin-nitrokey committed Nov 23, 2023
1 parent 2d31b44 commit 71eb02a
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 15 deletions.
14 changes: 8 additions & 6 deletions Cargo.lock

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

13 changes: 7 additions & 6 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ version = "1.6.0-rc.1"
[patch.crates-io]
# forked
admin-app = { git = "https://github.com/Nitrokey/admin-app", tag = "v0.1.0-nitrokey.6" }
ctap-types = { git = "https://github.com/Nitrokey/ctap-types.git", branch = "empty-response" }
fido-authenticator = { git = "https://github.com/Nitrokey/fido-authenticator.git", branch = "large-blobs" }
ctap-types = { git = "https://github.com/Nitrokey/ctap-types.git", branch = "usbd-ctaphid" }
fido-authenticator = { git = "https://github.com/Nitrokey/fido-authenticator.git", branch = "large-blobs-chunked" }
flexiber = { git = "https://github.com/Nitrokey/flexiber", tag = "0.1.1.nitrokey" }
lpc55-hal = { git = "https://github.com/Nitrokey/lpc55-hal", tag = "v0.3.0-nitrokey.2" }
serde-indexed = { git = "https://github.com/nitrokey/serde-indexed.git", tag = "v0.1.0-nitrokey.2" }
Expand All @@ -23,7 +23,8 @@ serde-indexed = { git = "https://github.com/nitrokey/serde-indexed.git", tag = "
apdu-dispatch = { git = "https://github.com/Nitrokey/apdu-dispatch.git", tag = "v0.1.2-nitrokey.2" }
ctaphid-dispatch = { git = "https://github.com/Nitrokey/ctaphid-dispatch.git", tag = "v0.1.1-nitrokey.3" }
iso7816 = { git = "https://github.com/Nitrokey/iso7816.git", tag = "v0.1.1-nitrokey.2"}
trussed = { git = "https://github.com/Nitrokey/trussed.git", rev = "v0.1.0-nitrokey.14" }
# trussed = { git = "https://github.com/Nitrokey/trussed.git", rev = "v0.1.0-nitrokey.14" }
trussed = { git = "https://github.com/Nitrokey/trussed.git", branch = "rename" }
usbd-ctaphid = { git = "https://github.com/Nitrokey/usbd-ctaphid.git", tag = "v0.1.0-nitrokey.2" }
usbd-ccid = { git = "https://github.com/Nitrokey/usbd-ccid", tag = "v0.2.0-nitrokey.1" }

Expand All @@ -33,9 +34,9 @@ webcrypt = { git = "https://github.com/nitrokey/nitrokey-websmartcard-rust", tag
opcard = { git = "https://github.com/Nitrokey/opcard-rs", tag = "v1.2.0" }
piv-authenticator = { git = "https://github.com/Nitrokey/piv-authenticator", tag = "v0.3.3" }
se05x = { git = "https://github.com/Nitrokey/se05x.git", tag = "v0.1.0"}
trussed-auth = { git = "https://github.com/Nitrokey/trussed-auth", tag = "v0.2.2-nitrokey.1" }
trussed-rsa-alloc = { git = "https://github.com/Nitrokey/trussed-rsa-backend.git", tag = "v0.1.0"}
trussed-staging = { git = "https://github.com/trussed-dev/trussed-staging.git", branch = "hmacsha256p256" }
trussed-auth = { git = "https://github.com/Nitrokey/trussed-auth", rev = "62235294bd63977bbb88eb01e7ac44b8010eb450" }
trussed-rsa-alloc = { git = "https://github.com/Nitrokey/trussed-rsa-backend.git", rev = "2f51478f0861ff8db19fdd5290f023ab6f4c2fb9" }
trussed-staging = { git = "https://github.com/Nitrokey/trussed-staging.git", branch = "hmacsha256p256-chunked" }
trussed-usbip = { git = "https://github.com/Nitrokey/pc-usbip-runner.git", tag = "v0.0.1-nitrokey.3" }
trussed-se050-backend = { git = "https://github.com/Nitrokey/trussed-se050-backend.git", tag = "v0.1.0-test-driver" }

Expand Down
4 changes: 2 additions & 2 deletions components/apps/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ trussed-staging = { version = "0.1.0", features = ["wrap-key-to-file", "chunked"

# apps
admin-app = "0.1.0"
fido-authenticator = { version = "0.1.1", features = ["dispatch", "log-all"], optional = true }
fido-authenticator = { version = "0.1.1", features = ["chunked", "dispatch", "log-all"], optional = true }
ndef-app = { path = "../ndef-app", optional = true }
webcrypt = { version = "0.8.0", optional = true }
secrets-app = { version = "0.13.0", features = ["apdu-dispatch", "ctaphid"], optional = true }
Expand All @@ -42,7 +42,7 @@ provisioner = ["provisioner-app", "trussed/clients-5"]
# apps
secrets-app = ["dep:secrets-app", "backend-auth"]
webcrypt = ["dep:webcrypt", "backend-auth", "backend-rsa", "backend-staging", "trussed-staging/hmacsha256p256"]
fido-authenticator = ["dep:fido-authenticator", "usbd-ctaphid"]
fido-authenticator = ["dep:fido-authenticator", "backend-staging", "usbd-ctaphid"]
opcard = ["dep:opcard", "backend-rsa", "backend-auth", "backend-staging"]
piv-authenticator = ["dep:piv-authenticator", "backend-rsa", "backend-auth", "backend-staging"]
se050-test-app = ["se050", "admin-app/se050"]
Expand Down
9 changes: 8 additions & 1 deletion components/apps/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,7 @@ impl<R: Runner> App<R> for FidoApp<R> {
// TODO: only enable if EFS is available
large_blobs: Some(fido_authenticator::LargeBlobsConfig {
location: Location::External,
max_size: 1024,
max_size: 4096,
}),
},
)
Expand All @@ -463,6 +463,13 @@ impl<R: Runner> App<R> for FidoApp<R> {
static INTERRUPT: InterruptFlag = InterruptFlag::new();
Some(&INTERRUPT)
}

fn backends(_runner: &R, _config: &Self::Config) -> &'static [BackendId<Backend>] {
&[
BackendId::Custom(Backend::Staging),
BackendId::Core,
]
}
}

#[cfg(feature = "webcrypt")]
Expand Down

0 comments on commit 71eb02a

Please sign in to comment.