tyler/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

src/backup/crypt_config.rs: simplify decode interface

Browse Source
This commit is contained in:
Dietmar Maurer
2019-06-22 13:24:29 +02:00
parent 0066c6d972
commit 9f83e0f7ee
3 changed files with 33 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/backup/data_blob.rs
View File

@ -1,7 +1,9 @@
use failure::*;
use std::convert::TryInto;
use crate::tools::write::*;
use crate::tools::read::ReadUtilOps;
use crate::tools::write::WriteUtilOps;
use super::*;
/// Data blob binary storage format
@ -154,11 +156,14 @@ impl DataBlob {
let data = zstd::block::decompress(&self.raw_data[data_start..], 16*1024*1024)?;
return Ok(data);
} else if magic == &ENCR_COMPR_BLOB_MAGIC_1_0 || magic == &ENCRYPTED_BLOB_MAGIC_1_0 {
let header_len = std::mem::size_of::<EncryptedDataBlobHeader>();
let head = (&self.raw_data[..header_len]).read_value::<EncryptedDataBlobHeader>()?;
if let Some(config) = config {
let data = if magic == &ENCR_COMPR_BLOB_MAGIC_1_0 {
config.decode_compressed_chunk(&self.raw_data)?
config.decode_compressed_chunk(&self.raw_data[header_len..], &head.iv, &head.tag)?
} else {
config.decode_uncompressed_chunk(&self.raw_data)?
config.decode_uncompressed_chunk(&self.raw_data[header_len..], &head.iv, &head.tag)?
};
return Ok(data);
} else {