Skip to content

Adapt to Nitrokey/trussed#29 #9

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

Merged
sosthene-nitrokey merged 1 commit into from
Nov 9, 2023
Merged

Adapt to Nitrokey/trussed#29 #9

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
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,4 @@ log-warn = []
log-error = []

[patch.crates-io]
trussed = { git = "https://github.com/trussed-dev/trussed.git", rev = "51e68500d7601d04f884f5e95567d14b9018a6cb" }
trussed = { git = "https://github.com/trussed-dev/trussed.git", rev = "df720980888e3e0d5487250bd14a28db02a5f13b" }
9 changes: 6 additions & 3 deletions src/streaming/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,7 @@ impl ExtensionImpl<ChunkedExtension> for super::StagingBackend {
resources: &mut ServiceResources<P>,
) -> Result<ChunkedReply, Error> {
let rng = &mut resources.rng()?;
let keystore = &mut resources.keystore(core_ctx)?;
let keystore = &mut resources.keystore(core_ctx.path.clone())?;
let filestore = &mut resources.filestore(core_ctx.path.clone());
let client_id = &core_ctx.path;
let store = resources.platform_mut().store();
Expand Down Expand Up @@ -482,7 +482,8 @@ impl ExtensionImpl<ChunkedExtension> for super::StagingBackend {
Ok(reply::WriteChunk {}.into())
}
ChunkedRequest::AbortChunkedWrite(_request) => {
let Some(ChunkedIoState::Write(ref write_state)) = backend_ctx.chunked_io_state else {
let Some(ChunkedIoState::Write(ref write_state)) = backend_ctx.chunked_io_state
else {
return Ok(reply::AbortChunkedWrite { aborted: false }.into());
};
let aborted = store::abort_chunked_write(
Expand Down Expand Up @@ -673,7 +674,9 @@ fn read_encrypted_chunk(
ctx: &mut StagingContext,
) -> Result<ChunkedReply, Error> {
let Some(ChunkedIoState::EncryptedRead(ref mut read_state)) = ctx.chunked_io_state else {
unreachable!("Read encrypted chunk can only be called in the context encrypted chunk reads");
unreachable!(
"Read encrypted chunk can only be called in the context encrypted chunk reads"
);
};
let (mut data, len): (Bytes<{ MAX_MESSAGE_LENGTH + POLY1305_TAG_LEN }>, usize) =
store::filestore_read_chunk(
Expand Down
2 changes: 1 addition & 1 deletion src/wrap_key_to_file/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ impl ExtensionImpl<WrapKeyToFileExtension> for super::StagingBackend {
request: &WrapKeyToFileRequest,
resources: &mut ServiceResources<P>,
) -> Result<WrapKeyToFileReply, Error> {
let keystore = &mut resources.keystore(core_ctx)?;
let keystore = &mut resources.keystore(core_ctx.path.clone())?;
let filestore = &mut resources.filestore(core_ctx.path.clone());
match request {
WrapKeyToFileRequest::WrapKeyToFile(request) => {
Expand Down