Skip to content

decrypt: fix dropped error #1304

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
hiddeco merged 1 commit into from
Sep 30, 2023
Merged

decrypt: fix dropped error #1304

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
3 changes: 3 additions & 0 deletions decrypt/decrypt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,9 @@ func DataWithFormat(data []byte, format Format) (cleartext []byte, err error) {
key,
tree.Metadata.LastModified.Format(time.RFC3339),
)
if err != nil {
Copy link
Contributor

@felixfontein felixfontein Sep 27, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In case err != nil, very likely the check originalMac != mac also fails, so an error would have already been returned - but the message would not be so helpful (probably something like "...: expected mac xxx, got "). So handling the error here is definitely a good thing!

return nil, fmt.Errorf("Failed to decrypt original mac: %w", err)
}
if originalMac != mac {
return nil, fmt.Errorf("Failed to verify data integrity. expected mac %q, got %q", originalMac, mac)
}
Expand Down