From 39dd16dd0c7abb4f86d887926e986591bdda7616 Mon Sep 17 00:00:00 2001
From: Brian Yule <brian.yule@hotmail.com>
Date: Mon, 28 Mar 2022 15:07:10 +0100
Subject: [PATCH 1/2] This is to fix CVE-2021-32840, CVE-2021-32842 and
 CVE-2021-32841 by updating SharpZipLib to 1.3.3 from 1.3.2.

---
 main/NPOI.Core.csproj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/main/NPOI.Core.csproj b/main/NPOI.Core.csproj
index 09de52fc6..5dcd16cbb 100644
--- a/main/NPOI.Core.csproj
+++ b/main/NPOI.Core.csproj
@@ -26,7 +26,7 @@
     <PackageReference Include="Enums.NET" Version="4.0.0" />
     <PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="2.2.0" />
     <PackageReference Include="Portable.BouncyCastle" Version="1.8.9" />
-    <PackageReference Include="SharpZipLib" Version="1.3.2" />
+    <PackageReference Include="SharpZipLib" Version="1.3.3" />
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.5.0" />
     <PackageReference Include="System.Drawing.Common" Version="4.5.0" />
     <PackageReference Include="System.Text.Encoding" Version="4.3.0" />
@@ -34,4 +34,4 @@
     <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
   </ItemGroup>
 
-</Project>
+</Project>
\ No newline at end of file

From 69fcda51b7e4838f21cd3f0ec27c1771c91d87e7 Mon Sep 17 00:00:00 2001
From: Brian Yule <brian.yule@hotmail.com>
Date: Mon, 28 Mar 2022 15:08:19 +0100
Subject: [PATCH 2/2] Adding fix for SharpZipLib

---
 main/NPOI.csproj                            | 2 +-
 main/packages.config                        | 2 +-
 ooxml/packages.config                       | 2 +-
 openxml4Net/packages.config                 | 2 +-
 testcases/main/NPOI.TestCases.csproj        | 2 +-
 testcases/ooxml/NPOI.OOXML.TestCases.csproj | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/main/NPOI.csproj b/main/NPOI.csproj
index 809114adf..29d562d79 100644
--- a/main/NPOI.csproj
+++ b/main/NPOI.csproj
@@ -1365,7 +1365,7 @@
       <Version>1.8.9</Version>
     </PackageReference>
     <PackageReference Include="SharpZipLib">
-      <Version>1.3.2</Version>
+      <Version>1.3.3</Version>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/main/packages.config b/main/packages.config
index d460d74a6..7e45f57f7 100644
--- a/main/packages.config
+++ b/main/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Portable.BouncyCastle" version="1.8.6" targetFramework="net45" />
-  <package id="SharpZipLib" version="1.3.1" targetFramework="net45" />
+  <package id="SharpZipLib" version="1.3.3" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/ooxml/packages.config b/ooxml/packages.config
index d460d74a6..7e45f57f7 100644
--- a/ooxml/packages.config
+++ b/ooxml/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Portable.BouncyCastle" version="1.8.6" targetFramework="net45" />
-  <package id="SharpZipLib" version="1.3.1" targetFramework="net45" />
+  <package id="SharpZipLib" version="1.3.3" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/openxml4Net/packages.config b/openxml4Net/packages.config
index c8abe76cc..04ff7ff2c 100644
--- a/openxml4Net/packages.config
+++ b/openxml4Net/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="SharpZipLib" version="1.3.2" targetFramework="net45" />
+  <package id="SharpZipLib" version="1.3.3" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/testcases/main/NPOI.TestCases.csproj b/testcases/main/NPOI.TestCases.csproj
index 3b6140662..f67583a1c 100644
--- a/testcases/main/NPOI.TestCases.csproj
+++ b/testcases/main/NPOI.TestCases.csproj
@@ -720,7 +720,7 @@
       <Version>3.13.1</Version>
     </PackageReference>
     <PackageReference Include="SharpZipLib">
-      <Version>1.3.2</Version>
+      <Version>1.3.3</Version>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
diff --git a/testcases/ooxml/NPOI.OOXML.TestCases.csproj b/testcases/ooxml/NPOI.OOXML.TestCases.csproj
index 8d383ebb0..de4f84064 100644
--- a/testcases/ooxml/NPOI.OOXML.TestCases.csproj
+++ b/testcases/ooxml/NPOI.OOXML.TestCases.csproj
@@ -314,7 +314,7 @@
       <Version>1.8.9</Version>
     </PackageReference>
     <PackageReference Include="SharpZipLib">
-      <Version>1.3.2</Version>
+      <Version>1.3.3</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup />