Skip to content

Commit

Permalink
Update trussed
Browse files Browse the repository at this point in the history
  • Loading branch information
robin-nitrokey committed Mar 4, 2024
1 parent 012227d commit 1c00683
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 12 deletions.
5 changes: 2 additions & 3 deletions Cargo.lock

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

3 changes: 2 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,8 @@ serde-indexed = { git = "https://github.com/sosthene-nitrokey/serde-indexed.git"
apdu-dispatch = { git = "https://github.com/trussed-dev/apdu-dispatch.git", rev = "915fc237103fcecc29d0f0b73391f19abf6576de" }
ctap-types = { git = "https://github.com/trussed-dev/ctap-types.git", rev = "7d4ad69e64ad308944c012aef5b9cfd7654d9be8" }
iso7816 = { git = "https://github.com/Nitrokey/iso7816.git", tag = "v0.1.1-nitrokey.1" }
trussed = { git = "https://github.com/trussed-dev/trussed.git", rev = "b1781805a2e33615d2d00b8bec80c0b1f5870ca1" }
littlefs2 = { git = "https://github.com/trussed-dev/littlefs2.git", rev = "ebd27e49ca321089d01d8c9b169c4aeb58ceeeca" }
trussed = { git = "https://github.com/trussed-dev/trussed.git", rev = "cff2e663841b6a68d3a8ce12647d57b2b6fbc36c" }
usbd-ctaphid = { git = "https://github.com/Nitrokey/usbd-ctaphid", tag = "v0.1.0-nitrokey.1" }

# unreleased crates
Expand Down
18 changes: 10 additions & 8 deletions src/lib/commands.rs
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ where
let wrapped_key =
syscall!(w
.trussed
.wrap_key_chacha8poly1305(wrapping_key, private_key, &appid))
.wrap_key_chacha8poly1305(wrapping_key, private_key, &appid, None))
.wrapped_key;

let nonce_2 = syscall!(w.trussed.random_bytes(12));
Expand Down Expand Up @@ -771,13 +771,15 @@ where
.ok_or(Error::FailedLoadingData)?;

// decrypt with shared secret
let decrypted = try_syscall!(w.trussed.decrypt_aes256cbc(serialized_reimported, req.data))
.map_err(|_e| {
error!("Decryption error: {:?}", _e);
Error::FailedLoadingData
})?
.plaintext
.ok_or(Error::InternalError)?;
let decrypted = try_syscall!(w
.trussed
.decrypt_aes256cbc(serialized_reimported, req.data, &[]))
.map_err(|_e| {
error!("Decryption error: {:?}", _e);
Error::FailedLoadingData
})?
.plaintext
.ok_or(Error::InternalError)?;

syscall!(w.trussed.delete(shared_secret));
syscall!(w.trussed.delete(serialized_reimported));
Expand Down

0 comments on commit 1c00683

Please sign in to comment.