src/backup/data_blob.rs - compute_crc: start after blob header

This commit is contained in:
Dietmar Maurer 2019-08-12 11:32:26 +02:00
parent 1cbdfd19a2
commit 5d15cb49b4
1 changed files with 18 additions and 1 deletions

View File

@ -20,6 +20,23 @@ pub struct DataBlob {
impl DataBlob { impl DataBlob {
pub fn header_size(magic: &[u8; 8]) -> usize {
match magic {
&UNCOMPRESSED_CHUNK_MAGIC_1_0 => std::mem::size_of::<DataChunkHeader>(),
&COMPRESSED_CHUNK_MAGIC_1_0 => std::mem::size_of::<DataChunkHeader>(),
&ENCRYPTED_CHUNK_MAGIC_1_0 => std::mem::size_of::<EncryptedDataChunkHeader>(),
&ENCR_COMPR_CHUNK_MAGIC_1_0 => std::mem::size_of::<EncryptedDataChunkHeader>(),
&UNCOMPRESSED_BLOB_MAGIC_1_0 => std::mem::size_of::<DataBlobHeader>(),
&COMPRESSED_BLOB_MAGIC_1_0 => std::mem::size_of::<DataBlobHeader>(),
&ENCRYPTED_BLOB_MAGIC_1_0 => std::mem::size_of::<EncryptedDataBlobHeader>(),
&ENCR_COMPR_BLOB_MAGIC_1_0 => std::mem::size_of::<EncryptedDataBlobHeader>(),
&AUTHENTICATED_BLOB_MAGIC_1_0 => std::mem::size_of::<AuthenticatedDataBlobHeader>(),
&AUTH_COMPR_BLOB_MAGIC_1_0 => std::mem::size_of::<AuthenticatedDataBlobHeader>(),
_ => panic!("unknown blob magic"),
}
}
/// accessor to raw_data field /// accessor to raw_data field
pub fn raw_data(&self) -> &[u8] { pub fn raw_data(&self) -> &[u8] {
&self.raw_data &self.raw_data
@ -50,7 +67,7 @@ impl DataBlob {
/// compute the CRC32 checksum /// compute the CRC32 checksum
pub fn compute_crc(&self) -> u32 { pub fn compute_crc(&self) -> u32 {
let mut hasher = crc32fast::Hasher::new(); let mut hasher = crc32fast::Hasher::new();
let start = std::mem::size_of::<DataBlobHeader>(); // start after HEAD let start = Self::header_size(self.magic()); // start after HEAD
hasher.update(&self.raw_data[start..]); hasher.update(&self.raw_data[start..]);
hasher.finalize() hasher.finalize()
} }