Merge branch 'master' into aes-encryption3

Signed-off-by: Chris Hennick <4961925+Pr0methean@users.noreply.github.com>

src/spec.rs

@@ -217,7 +217,7 @@ impl Zip64CentralDirectoryEnd {
 }
 
 /// Converts a path to the ZIP format (forward-slash-delimited and normalized).
-pub(crate) fn path_to_string<T: AsRef<Path>>(path: T) -> String {
+pub(crate) fn path_to_string<T: AsRef<Path>>(path: T) -> Box<str> {
     let mut maybe_original = None;
     if let Some(original) = path.as_ref().to_str() {
         if (MAIN_SEPARATOR == '/' || !original[1..].contains(MAIN_SEPARATOR))
@@ -238,9 +238,6 @@ pub(crate) fn path_to_string<T: AsRef<Path>>(path: T) -> String {
     let mut recreate = maybe_original.is_none();
     let mut normalized_components = Vec::new();
 
-    // Empty element ensures the path has a leading slash, with no extra allocation after the join
-    normalized_components.push(Cow::Borrowed(""));
-
     for component in path.as_ref().components() {
         match component {
             Component::Normal(os_str) => match os_str.to_str() {
@@ -252,9 +249,7 @@ pub(crate) fn path_to_string<T: AsRef<Path>>(path: T) -> String {
             },
             Component::ParentDir => {
                 recreate = true;
-                if normalized_components.len() > 1 {
+                normalized_components.pop();
-                    normalized_components.pop();
-                }
             }
             _ => {
                 recreate = true;
@@ -262,17 +257,8 @@ pub(crate) fn path_to_string<T: AsRef<Path>>(path: T) -> String {
         }
     }
     if recreate {
-        normalized_components.join("/")
+        normalized_components.join("/").into()
     } else {
-        drop(normalized_components);
+        maybe_original.unwrap().into()
-        let original = maybe_original.unwrap();
-        if !original.starts_with('/') {
-            let mut slash_original = String::with_capacity(original.len() + 1);
-            slash_original.push('/');
-            slash_original.push_str(original);
-            slash_original
-        } else {
-            original.to_string()
-        }
     }
 }

src/types.rs

@@ -49,6 +49,7 @@ mod atomic {
 use crate::extra_fields::ExtraField;
 use crate::result::DateTimeRangeError;
 use crate::CompressionMethod;
+use crate::types::ffi::S_IFDIR;
 #[cfg(feature = "time")]
 use time::{error::ComponentRange, Date, Month, OffsetDateTime, PrimitiveDateTime, Time};
 
@@ -443,20 +444,42 @@ impl ZipFileData {
         }
     }
 
-    pub const fn zip64_extension(&self) -> bool {
+    /// PKZIP version needed to open this file (from APPNOTE 4.4.3.2).
-        self.uncompressed_size > 0xFFFFFFFF
+    pub fn version_needed(&self) -> u16 {
-            || self.compressed_size > 0xFFFFFFFF
+        let compression_version: u16 = match self.compression_method {
-            || self.header_start > 0xFFFFFFFF
+            CompressionMethod::Stored => 10,
-    }
+            #[cfg(feature = "_deflate-any")]
-
+            CompressionMethod::Deflated => 20,
-    pub const fn version_needed(&self) -> u16 {
-        // higher versions matched first
-        match (self.zip64_extension(), self.compression_method) {
             #[cfg(feature = "bzip2")]
-            (_, crate::compression::CompressionMethod::Bzip2) => 46,
+            CompressionMethod::Bzip2 => 46,
-            (true, _) => 45,
+            #[cfg(feature = "deflate64")]
-            _ => 20,
+            CompressionMethod::Deflate64 => 21,
-        }
+            #[cfg(feature = "lzma")]
+            CompressionMethod::Lzma => 63,
+            // APPNOTE doesn't specify a version for Zstandard
+            _ => DEFAULT_VERSION as u16,
+        };
+        let crypto_version: u16 = if self.aes_mode.is_some() {
+            51
+        } else if self.encrypted {
+            20
+        } else {
+            10
+        };
+        let misc_feature_version: u16 = if self.large_file {
+            45
+        } else if self
+            .unix_mode()
+            .is_some_and(|mode| mode & S_IFDIR == S_IFDIR)
+        {
+            // file is directory
+            20
+        } else {
+            10
+        };
+        compression_version
+            .max(crypto_version)
+            .max(misc_feature_version)
     }
     #[inline(always)]
     pub(crate) fn extra_field_len(&self) -> usize {

src/write.rs

@@ -2055,9 +2055,9 @@ mod test {
         assert_eq!(
             *result.get_ref(),
             &[
-                80u8, 75, 3, 4, 20, 0, 0, 0, 0, 0, 163, 165, 15, 77, 252, 47, 111, 70, 6, 0, 0, 0,
+                80u8, 75, 3, 4, 10, 0, 0, 0, 0, 0, 163, 165, 15, 77, 252, 47, 111, 70, 6, 0, 0, 0,
                 6, 0, 0, 0, 4, 0, 0, 0, 110, 97, 109, 101, 116, 97, 114, 103, 101, 116, 80, 75, 1,
-                2, 46, 3, 20, 0, 0, 0, 0, 0, 163, 165, 15, 77, 252, 47, 111, 70, 6, 0, 0, 0, 6, 0,
+                2, 46, 3, 10, 0, 0, 0, 0, 0, 163, 165, 15, 77, 252, 47, 111, 70, 6, 0, 0, 0, 6, 0,
                 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 161, 0, 0, 0, 0, 110, 97, 109, 101,
                 80, 75, 5, 6, 0, 0, 0, 0, 1, 0, 1, 0, 50, 0, 0, 0, 40, 0, 0, 0, 0, 0
             ] as &[u8],
@@ -2077,7 +2077,7 @@ mod test {
             .start_file_from_path(path, SimpleFileOptions::default())
             .unwrap();
         let archive = ZipArchive::new(writer.finish().unwrap()).unwrap();
-        assert_eq!(Some("/foo/example.txt"), archive.name_for_index(0));
+        assert_eq!(Some("foo/example.txt"), archive.name_for_index(0));
     }
 
     #[test]
@@ -2100,11 +2100,11 @@ mod test {
         assert_eq!(
             *result.get_ref(),
             &[
-                80u8, 75, 3, 4, 20, 0, 0, 0, 0, 0, 163, 165, 15, 77, 95, 41, 81, 245, 36, 0, 0, 0,
+                80u8, 75, 3, 4, 10, 0, 0, 0, 0, 0, 163, 165, 15, 77, 95, 41, 81, 245, 36, 0, 0, 0,
                 36, 0, 0, 0, 14, 0, 0, 0, 100, 105, 114, 101, 99, 116, 111, 114, 121, 92, 108, 105,
                 110, 107, 47, 97, 98, 115, 111, 108, 117, 116, 101, 47, 115, 121, 109, 108, 105,
                 110, 107, 92, 119, 105, 116, 104, 92, 109, 105, 120, 101, 100, 47, 115, 108, 97,
-                115, 104, 101, 115, 80, 75, 1, 2, 46, 3, 20, 0, 0, 0, 0, 0, 163, 165, 15, 77, 95,
+                115, 104, 101, 115, 80, 75, 1, 2, 46, 3, 10, 0, 0, 0, 0, 0, 163, 165, 15, 77, 95,
                 41, 81, 245, 36, 0, 0, 0, 36, 0, 0, 0, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255,
                 161, 0, 0, 0, 0, 100, 105, 114, 101, 99, 116, 111, 114, 121, 92, 108, 105, 110,
                 107, 80, 75, 5, 6, 0, 0, 0, 0, 1, 0, 1, 0, 60, 0, 0, 0, 80, 0, 0, 0, 0, 0