From 5e297a0353615211177882eb3c254409705758af Mon Sep 17 00:00:00 2001 From: Paul-Christian Volkmer Date: Sat, 20 Apr 2024 23:49:09 +0200 Subject: [PATCH] chore: use zip crate version 1.1 --- Cargo.lock | 153 +++++++++++++++++++++++++++++++++++----------- Cargo.toml | 2 +- src/checks/osb.rs | 2 +- src/file_io.rs | 4 +- src/unzip_osb.rs | 2 +- 5 files changed, 120 insertions(+), 43 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index db926bd..3ccf8a2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -34,6 +34,15 @@ version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" +[[package]] +name = "arbitrary" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" +dependencies = [ + "derive_arbitrary", +] + [[package]] name = "async-trait" version = "0.1.80" @@ -60,12 +69,6 @@ dependencies = [ "rustc-demangle", ] -[[package]] -name = "base64ct" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" - [[package]] name = "bitflags" version = "2.5.0" @@ -188,6 +191,15 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" +[[package]] +name = "cmake" +version = "0.1.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130" +dependencies = [ + "cc", +] + [[package]] name = "console" version = "0.15.8" @@ -203,9 +215,9 @@ dependencies = [ [[package]] name = "constant_time_eq" -version = "0.1.5" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" +checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" [[package]] name = "cpufeatures" @@ -216,6 +228,21 @@ dependencies = [ "libc", ] +[[package]] +name = "crc" +version = "3.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636" +dependencies = [ + "crc-catalog", +] + +[[package]] +name = "crc-catalog" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" + [[package]] name = "crc32fast" version = "1.4.0" @@ -241,6 +268,12 @@ dependencies = [ "typenum", ] +[[package]] +name = "deflate64" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83ace6c86376be0b6cdcf3fb41882e81d94b31587573d1cfa9d01cd06bba210d" + [[package]] name = "deob" version = "0.1.0" @@ -257,6 +290,17 @@ dependencies = [ "powerfmt", ] +[[package]] +name = "derive_arbitrary" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "dialoguer" version = "0.11.0" @@ -316,6 +360,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" dependencies = [ "crc32fast", + "libz-ng-sys", "miniz_oxide", ] @@ -430,12 +475,38 @@ version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +[[package]] +name = "libz-ng-sys" +version = "1.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6409efc61b12687963e602df8ecf70e8ddacf95bc6576bcf16e3ac6328083c5" +dependencies = [ + "cmake", + "libc", +] + [[package]] name = "linux-raw-sys" version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" +[[package]] +name = "log" +version = "0.4.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" + +[[package]] +name = "lzma-rs" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "297e814c836ae64db86b36cf2a557ba54368d03f6afcd7d947c266692f71115e" +dependencies = [ + "byteorder", + "crc", +] + [[package]] name = "memchr" version = "2.7.2" @@ -496,27 +567,14 @@ dependencies = [ "zip", ] -[[package]] -name = "password-hash" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700" -dependencies = [ - "base64ct", - "rand_core", - "subtle", -] - [[package]] name = "pbkdf2" -version = "0.11.0" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" +checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" dependencies = [ "digest", "hmac", - "password-hash", - "sha2", ] [[package]] @@ -571,12 +629,6 @@ dependencies = [ "proc-macro2", ] -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" - [[package]] name = "rustc-demangle" version = "0.1.23" @@ -676,6 +728,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" +[[package]] +name = "simd-adler32" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + [[package]] name = "subtle" version = "2.5.0" @@ -755,6 +813,12 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "typed-arena" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" + [[package]] name = "typenum" version = "1.17.0" @@ -866,40 +930,55 @@ checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" [[package]] name = "zip" -version = "0.6.6" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" +checksum = "f21968e6da56f847a155a89581ba846507afa14854e041f3053edb6ddd19f807" dependencies = [ "aes", + "arbitrary", "byteorder", "bzip2", "constant_time_eq", "crc32fast", "crossbeam-utils", + "deflate64", "flate2", "hmac", + "lzma-rs", "pbkdf2", "sha1", "time", + "zopfli", "zstd", ] [[package]] -name = "zstd" -version = "0.11.2+zstd.1.5.2" +name = "zopfli" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" +checksum = "5c1f48f3508a3a3f2faee01629564400bc12260f6214a056d06a3aaaa6ef0736" +dependencies = [ + "crc32fast", + "log", + "simd-adler32", + "typed-arena", +] + +[[package]] +name = "zstd" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d789b1514203a1120ad2429eae43a7bd32b90976a7bb8a05f7ec02fa88cc23a" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "5.0.2+zstd.1.5.2" +version = "7.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db" +checksum = "1cd99b45c6bc03a018c8b8a86025678c87e55526064e38f9df301989dce7ec0a" dependencies = [ - "libc", "zstd-sys", ] diff --git a/Cargo.toml b/Cargo.toml index ee92a68..ceb33aa 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,7 +23,7 @@ dialoguer = "0.11" indicatif = "0.17" deob = { path = "./libs/deob", optional = true } -zip = { version = "0.6", optional = true } +zip = { version = "1.1", optional = true } bytes = "1.6" [features] diff --git a/src/checks/osb.rs b/src/checks/osb.rs index ea98a78..5ba324c 100644 --- a/src/checks/osb.rs +++ b/src/checks/osb.rs @@ -62,7 +62,7 @@ pub fn check_file(file: &Path, password: &str) -> Result, Check for i in 0..archive.len() { progress_bar.inc(1); - if let Ok(Ok(mut zip_file)) = archive.by_index_decrypt(i, password.as_bytes()) { + if let Ok(mut zip_file) = archive.by_index_decrypt(i, password.as_bytes()) { progress_bar.set_message(zip_file.name().to_string()); if zip_file.is_file() && zip_file.name().ends_with(".osc") { let mut buf = String::new(); diff --git a/src/file_io.rs b/src/file_io.rs index 75abdb9..5e1daf1 100644 --- a/src/file_io.rs +++ b/src/file_io.rs @@ -123,9 +123,7 @@ impl InputFile { let password = _password.unwrap_or_else(|| deobfuscate(env!("OSB_KEY").trim())); for i in 0..archive.len() { - if let Ok(Ok(mut zip_file)) = - archive.by_index_decrypt(i, password.as_bytes()) - { + if let Ok(mut zip_file) = archive.by_index_decrypt(i, password.as_bytes()) { if zip_file.is_file() && zip_file.name().ends_with(".osc") { let mut buf = String::new(); let _ = zip_file.read_to_string(&mut buf); diff --git a/src/unzip_osb.rs b/src/unzip_osb.rs index 129996c..e8196f4 100644 --- a/src/unzip_osb.rs +++ b/src/unzip_osb.rs @@ -77,7 +77,7 @@ pub fn unzip_osb_using_password(path: &str, dir: &str, password: &str) { }; for i in 0..archive.len() { - let mut file = if let Ok(Ok(file)) = archive.by_index_decrypt(i, password.as_bytes()) { + let mut file = if let Ok(file) = archive.by_index_decrypt(i, password.as_bytes()) { file } else { println!(