Merge pull request #593 from adamhathcock/fix-pkware-encryption

ReadFully used by pkware encryption didn’t like spans

src/SharpCompress/Utility.cs

@@ -280,7 +280,22 @@ private static byte[] GetTransferByteArray()
         {
             return ArrayPool<byte>.Shared.Rent(81920);
         }
-
+
+        public static bool ReadFully(this Stream stream, byte[] buffer)
+        {
+            int total = 0;
+            int read;
+            while ((read = stream.Read(buffer, total, buffer.Length - total)) > 0)
+            {
+                total += read;
+                if (total >= buffer.Length)
+                {
+                    return true;
+                }
+            }
+            return (total >= buffer.Length);
+        }
+
         public static bool ReadFully(this Stream stream, Span<byte> buffer)
         {
             int total = 0;

tests/SharpCompress.Test/Zip/ZipReaderTests.cs

@@ -268,6 +268,34 @@ public void Zip_Deflate_WinzipAES_Read()
             }
             VerifyFiles();
         }
+
+        [Fact]
+        public void Zip_Deflate_ZipCrypto_Read()
+        {
+            int count = 0;
+            using (Stream stream = File.OpenRead(Path.Combine(TEST_ARCHIVES_PATH, "zipcrypto.zip")))
+            using (var reader = ZipReader.Open(stream, new ReaderOptions()
+                                                       {
+                                                           Password = "test"
+                                                       }))
+            {
+                while (reader.MoveToNextEntry())
+                {
+                    if (!reader.Entry.IsDirectory)
+                    {
+                        Assert.Equal(CompressionType.None, reader.Entry.CompressionType);
+                        reader.WriteEntryToDirectory(SCRATCH_FILES_PATH,
+                                                     new ExtractionOptions()
+                                                     {
+                                                         ExtractFullPath = true,
+                                                         Overwrite = true
+                                                     });
+                        count++;
+                    }
+                }
+            }
+            Assert.Equal(8, count);
+        }
 
         [Fact]
         public void TestSharpCompressWithEmptyStream()