fixed calculation of encrypted object footer length

zff-team · Oct 14, 2023 · 0e8d86b · 0e8d86b
1 parent 8a36a5e
commit 0e8d86b
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git a/src/lib/footer/object_footer.rs b/src/lib/footer/object_footer.rs
@@ -374,18 +374,23 @@ impl ObjectFooterPhysical {
 		E: Borrow<EncryptionInformation>
 	{
 		let mut vec = Vec::new();
-		let mut encrypted_content = Encryption::encrypt_object_footer(
+		let encrypted_content = Encryption::encrypt_object_footer(
 			&encryption_information.borrow().encryption_key, 
 			self.encode_content(), 
 			self.object_number, 
 			&encryption_information.borrow().algorithm)?;
 		let identifier = Self::identifier();
-		let encoded_header_length = (DEFAULT_LENGTH_HEADER_IDENTIFIER + DEFAULT_LENGTH_VALUE_HEADER_LENGTH + encrypted_content.len()) as u64; //4 bytes identifier + 8 bytes for length + length itself
+		let encoded_header_length = (
+			DEFAULT_LENGTH_HEADER_IDENTIFIER +
+			DEFAULT_LENGTH_VALUE_HEADER_LENGTH + 
+			self.version.encode_directly().len() +
+			self.object_number.encode_directly().len() +
+			encrypted_content.encode_directly().len()) as u64; //4 bytes identifier + 8 bytes for length + length itself
 		vec.append(&mut identifier.to_be_bytes().to_vec());
 		vec.append(&mut encoded_header_length.encode_directly());
 		vec.append(&mut self.version.encode_directly());
 		vec.append(&mut self.object_number.encode_directly());
-		vec.append(&mut encrypted_content);
+		vec.append(&mut encrypted_content.encode_directly());
 
 		Ok(vec)
 	}
@@ -703,18 +708,23 @@ impl ObjectFooterLogical {
 		E: Borrow<EncryptionInformation>
 	{
 		let mut vec = Vec::new();
-		let mut encrypted_content = Encryption::encrypt_object_footer(
+		let encrypted_content = Encryption::encrypt_object_footer(
 			&encryption_information.borrow().encryption_key, 
 			self.encode_content(), 
 			self.object_number, 
 			&encryption_information.borrow().algorithm)?;
 		let identifier = Self::identifier();
-		let encoded_header_length = (DEFAULT_LENGTH_HEADER_IDENTIFIER + DEFAULT_LENGTH_VALUE_HEADER_LENGTH + encrypted_content.len()) as u64; //4 bytes identifier + 8 bytes for length + length itself
+		let encoded_header_length = (
+			DEFAULT_LENGTH_HEADER_IDENTIFIER + 
+			DEFAULT_LENGTH_VALUE_HEADER_LENGTH + 
+			self.version.encode_directly().len() +
+			self.object_number.encode_directly().len() +
+			encrypted_content.encode_directly().len()) as u64; //4 bytes identifier + 8 bytes for length + length itself
 		vec.append(&mut identifier.to_be_bytes().to_vec());
 		vec.append(&mut encoded_header_length.encode_directly());
 		vec.append(&mut self.version.encode_directly());
 		vec.append(&mut self.object_number.encode_directly());
-		vec.append(&mut encrypted_content);
+		vec.append(&mut encrypted_content.encode_directly());
 
 		Ok(vec)
 	}

diff --git a/src/lib/io/zffreader.rs b/src/lib/io/zffreader.rs
@@ -1065,18 +1065,14 @@ fn initialize_encrypted_object_reader<R: Read + Seek>(
 	segments: &mut HashMap<u64, Segment<R>>,
 	) -> Result<ZffObjectReader> {
 
-
-
 	let header = match segments.get_mut(&header_segment_no) {
 		None => return Err(ZffError::new(ZffErrorKind::MissingSegment, header_segment_no.to_string())),
 		Some(segment) => segment.read_encrypted_object_header(obj_number)?,
 	};
-
 	let footer = match segments.get_mut(&footer_segment_no) {
 		None => return Err(ZffError::new(ZffErrorKind::MissingSegment, header_segment_no.to_string())),
 		Some(segment) => segment.read_encrypted_object_footer(obj_number)?,
 	};
-
 	let obj_reader = ZffObjectReader::Encrypted(Box::new(ZffObjectReaderEncrypted::with_data(header, footer)));
 	Ok(obj_reader)
 }