DevComp/zip-rs-wasm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix: Incorrect header when adding AES-encrypted files

Browse source
This commit is contained in:
Chris Hennick 2024-06-13 19:24:54 -07:00
parent 0bd2fe11d7
commit 1e118199f7
No known key found for this signature in database
GPG key ID: DA47AABA4961C509
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/write.rs
View file

@ -847,9 +847,9 @@ impl<W: Write + Seek> ZipWriter<W> {
#[allow(unused_mut)] #[allow(unused_mut)]
let mut aes_extra_data_start = 0; let mut aes_extra_data_start = 0;
#[cfg(feature = "aes-crypto")] #[cfg(feature = "aes-crypto")]
if let Some(EncryptWith::Aes { .. }) = options.encrypt_with { if let Some(EncryptWith::Aes { mode, .. }) = options.encrypt_with {
const AES_DUMMY_EXTRA_DATA: [u8; 11] = [ let aes_dummy_extra_data: [u8; 11] = [
0x01, 0x99, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x99, 0x07, 0x00, 0x02, 0x00, 0x41, 0x45, mode as u8, 0x00, 0x00,
]; ];
let extra_data = extra_field.get_or_insert_with(Default::default); let extra_data = extra_field.get_or_insert_with(Default::default);
@ -861,7 +861,7 @@ impl<W: Write + Seek> ZipWriter<W> {
} }
}; };
if extra_data.len() + AES_DUMMY_EXTRA_DATA.len() > u16::MAX as usize { if extra_data.len() + aes_dummy_extra_data.len() > u16::MAX as usize {
let _ = self.abort_file(); let _ = self.abort_file();
return Err(InvalidArchive("Extra data field is too large")); return Err(InvalidArchive("Extra data field is too large"));
} }
@ -870,7 +870,7 @@ impl<W: Write + Seek> ZipWriter<W> {
// We write zero bytes for now since we need to update the data when finishing the // We write zero bytes for now since we need to update the data when finishing the
// file. // file.
extra_data.write_all(&AES_DUMMY_EXTRA_DATA)?; extra_data.write_all(&aes_dummy_extra_data)?;
} }
{ {