In ZipOutputStream.PutNextEntry, account for AES overhead when calculating compressed entry size

Author: Numpsy

src/ICSharpCode.SharpZipLib/Zip/ZipOutputStream.cs

@@ -327,7 +327,21 @@ public void PutNextEntry(ZipEntry entry)
 				}
 				else
 				{
-					WriteLeInt(entry.IsCrypted ? (int)entry.CompressedSize + ZipConstants.CryptoHeaderSize : (int)entry.CompressedSize);
+					int entryCompressedSize = (int)entry.CompressedSize;
+
+					if (entry.IsCrypted)
+					{
+						if (entry.AESKeySize > 0)
+						{
+							entryCompressedSize += entry.AESOverheadSize;
+						}
+						else
+						{
+							entryCompressedSize += ZipConstants.CryptoHeaderSize;
+						}
+					}
+
+					WriteLeInt(entryCompressedSize);
 					WriteLeInt((int)entry.Size);
 				}
 			}
@@ -372,7 +386,22 @@ public void PutNextEntry(ZipEntry entry)
 				if (headerInfoAvailable)
 				{
 					ed.AddLeLong(entry.Size);
-					ed.AddLeLong(entry.CompressedSize);
+
+					long entryCompressedSize = entry.CompressedSize;
+
+					if (entry.IsCrypted)
+					{
+						if (entry.AESKeySize > 0)
+						{
+							entryCompressedSize += entry.AESOverheadSize;
+						}
+						else
+						{
+							entryCompressedSize += ZipConstants.CryptoHeaderSize;
+						}
+					}
+
+					ed.AddLeLong(entryCompressedSize);
 				}
 				else
 				{