Skip to content

Commit

Permalink
Adapt to updated trussed
Browse files Browse the repository at this point in the history
  • Loading branch information
sosthene-nitrokey committed Aug 28, 2023
1 parent c6aa6bd commit 83e3392
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
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
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
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

0 comments on commit 83e3392

Please sign in to comment.