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

src/backup/data_chunk.rs - decode: make crypt_config optional

Browse Source
This commit is contained in:
Dietmar Maurer 2019-06-13 11:44:38 +02:00
parent 046bcb9773
commit 51929e4532
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/backup/data_chunk.rs
View File

@ -95,7 +95,7 @@ impl DataChunk {
} }
/// Decode chunk data /// Decode chunk data
pub fn decode(self, config: &CryptConfig) -> Result<Vec<u8>, Error> { pub fn decode(self, config: Option<&CryptConfig>) -> Result<Vec<u8>, Error> {
let magic = self.magic(); let magic = self.magic();
@ -107,10 +107,13 @@ impl DataChunk {
return Ok(data); return Ok(data);
} else if magic == &ENCR_COMPR_CHUNK_MAGIC_1_0 || magic == &ENCRYPTED_CHUNK_MAGIC_1_0 { } else if magic == &ENCR_COMPR_CHUNK_MAGIC_1_0 || magic == &ENCRYPTED_CHUNK_MAGIC_1_0 {
if let Some(config) = config {
let data = config.decode_chunk(&self.raw_data)?;
let data = config.decode_chunk(&self.raw_data)?; return Ok(data);
} else {
return Ok(data); bail!("unable to decrypt chunk - missing CryptConfig");
}
} else { } else {
bail!("Invalid chunk magic number."); bail!("Invalid chunk magic number.");
} }