fix merge errors

Author: cosmicexplorer

src/read/pipelining.rs

@@ -902,17 +902,8 @@ pub mod split_extraction {
                                     let limited_reader = ((&mut compressed_read_end)
                                         as &mut dyn Read)
                                         .take(entry.compressed_size);
-                                    let crypto_reader = make_crypto_reader(
-                                        entry.compression_method,
-                                        entry.crc32,
-                                        None,
-                                        false,
-                                        limited_reader,
-                                        None,
-                                        None,
-                                        #[cfg(feature = "aes-crypto")]
-                                        entry.compressed_size,
-                                    )?;
+                                    let crypto_reader =
+                                        make_crypto_reader(entry, limited_reader, None, None)?;
                                     let mut decompressing_reader = make_reader(
                                         entry.compression_method,
                                         entry.crc32,

src/spec.rs

@@ -174,6 +174,17 @@ pub(crate) trait FixedSizeBlock: Pod {
     #[allow(clippy::wrong_self_convention)]
     fn from_le(self) -> Self;
 
+    fn interpret(input_block: &[u8]) -> ZipResult<Self> {
+        let mut block = Self::zeroed();
+        block.as_bytes_mut().copy_from_slice(input_block);
+        let block = Self::from_le(block);
+
+        if block.magic() != Self::MAGIC {
+            return Err(Self::WRONG_MAGIC_ERROR);
+        }
+        Ok(block)
+    }
+
     fn parse<R: Read>(reader: &mut R) -> ZipResult<Self> {
         let mut block = Self::zeroed();
         reader.read_exact(block.as_bytes_mut())?;