Skip to content

client: encrypted_item: Remove unnecesary allocs #281

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
merged 1 commit into from
Jul 26, 2025
Merged

client: encrypted_item: Remove unnecesary allocs #281

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
15 changes: 10 additions & 5 deletions client/src/file/api/encrypted_item.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,23 @@ impl EncryptedItem {
self.hashed_attributes.get(key).map(|b| b.as_slice()) == Some(blob)
}

pub fn decrypt(mut self, key: &Key) -> Result<Item, Error> {
let mac_tag = self.blob.split_off(self.blob.len() - crypto::mac_len());
pub fn decrypt(self, key: &Key) -> Result<Item, Error> {
let n = self.blob.len();
let n_mac = crypto::mac_len();
let n_iv = crypto::iv_len();

// The encrypted data, the iv, and the mac are concatenated into blob.
let (encrypted_data_with_iv, mac_tag) = &self.blob.split_at(n - n_mac);

// verify item
if !crypto::verify_mac(&self.blob, key, mac_tag)? {
if !crypto::verify_mac(encrypted_data_with_iv, key, mac_tag)? {
return Err(Error::MacError);
}

let iv = self.blob.split_off(self.blob.len() - crypto::iv_len());
let (encrypted_data, iv) = encrypted_data_with_iv.split_at(n - n_mac - n_iv);

// decrypt item
let decrypted = crypto::decrypt(self.blob, key, iv)?;
let decrypted = crypto::decrypt(encrypted_data, key, iv)?;

let item = Item::try_from(decrypted.as_slice())?;

Expand Down