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

add and use AES associated constant

Browse source
This commit is contained in:
Lireer 2022-01-30 15:10:07 +01:00
parent fddad8965d
commit 49f7501c5f
4 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/compression.rs
View file

@ -28,6 +28,7 @@ pub enum CompressionMethod {
/// ///
/// The actual compression method has to be taken from the AES extra data field /// The actual compression method has to be taken from the AES extra data field
/// or from `ZipFileData`. /// or from `ZipFileData`.
#[cfg(feature = "aes-crypto")]
Aes, Aes,
/// Compress the file using ZStandard /// Compress the file using ZStandard
#[cfg(feature = "zstd")] #[cfg(feature = "zstd")]
@ -77,6 +78,10 @@ impl CompressionMethod {
pub const JPEG: Self = CompressionMethod::Unsupported(96); pub const JPEG: Self = CompressionMethod::Unsupported(96);
pub const WAVPACK: Self = CompressionMethod::Unsupported(97); pub const WAVPACK: Self = CompressionMethod::Unsupported(97);
pub const PPMD: Self = CompressionMethod::Unsupported(98); pub const PPMD: Self = CompressionMethod::Unsupported(98);
#[cfg(feature = "aes-crypto")]
pub const AES: Self = CompressionMethod::Aes;
#[cfg(not(feature = "aes-crypto"))]
pub const AES: Self = CompressionMethod::Unsupported(99);
} }
impl CompressionMethod { impl CompressionMethod {
/// Converts an u16 to its corresponding CompressionMethod /// Converts an u16 to its corresponding CompressionMethod
@ -96,9 +101,9 @@ impl CompressionMethod {
8 => CompressionMethod::Deflated, 8 => CompressionMethod::Deflated,
#[cfg(feature = "bzip2")] #[cfg(feature = "bzip2")]
12 => CompressionMethod::Bzip2, 12 => CompressionMethod::Bzip2,
99 => CompressionMethod::Aes,
#[cfg(feature = "zstd")] #[cfg(feature = "zstd")]
93 => CompressionMethod::Zstd, 93 => CompressionMethod::Zstd,
99 => CompressionMethod::AES,
v => CompressionMethod::Unsupported(v), v => CompressionMethod::Unsupported(v),
} }
@ -121,7 +126,7 @@ impl CompressionMethod {
CompressionMethod::Deflated => 8, CompressionMethod::Deflated => 8,
#[cfg(feature = "bzip2")] #[cfg(feature = "bzip2")]
CompressionMethod::Bzip2 => 12, CompressionMethod::Bzip2 => 12,
CompressionMethod::Aes => 99, CompressionMethod::AES => 99,
#[cfg(feature = "zstd")] #[cfg(feature = "zstd")]
CompressionMethod::Zstd => 93, CompressionMethod::Zstd => 93,

2
src/read.rs
View file

@ -669,7 +669,7 @@ pub(crate) fn central_header_to_zip_file<R: Read + io::Seek>(
Err(e) => return Err(e), Err(e) => return Err(e),
} }
let aes_enabled = result.compression_method == CompressionMethod::Aes; let aes_enabled = result.compression_method == CompressionMethod::AES;
if aes_enabled && result.aes_mode.is_none() { if aes_enabled && result.aes_mode.is_none() {
return Err(ZipError::InvalidArchive( return Err(ZipError::InvalidArchive(
"AES encryption without AES extra data field", "AES encryption without AES extra data field",

2
src/write.rs
View file

@ -848,7 +848,7 @@ impl<W: Write + io::Seek> GenericZipWriter<W> {
CompressionMethod::Bzip2 => { CompressionMethod::Bzip2 => {
GenericZipWriter::Bzip2(BzEncoder::new(bare, bzip2::Compression::default())) GenericZipWriter::Bzip2(BzEncoder::new(bare, bzip2::Compression::default()))
} }
CompressionMethod::Aes => { CompressionMethod::AES => {
return Err(ZipError::UnsupportedArchive( return Err(ZipError::UnsupportedArchive(
"AES compression is not supported for writing", "AES compression is not supported for writing",
)) ))

2
tests/aes_encryption.rs
View file

@ -1,3 +1,5 @@
#![cfg(feature = "aes-crypto")]
use std::io::{self, Read}; use std::io::{self, Read};
use zip::ZipArchive; use zip::ZipArchive;