Merge remote-tracking branch 'original/develop' into portable

# Conflicts:
#	itextsharp.nuspec
#	itextsharp.pdfa.nuspec
#	itextsharp.xmlworker.nuspec
#	itextsharp.xtra.nuspec
#	src/core/AssemblyInfo.cs
#	src/core/iTextSharp/text/pdf/PdfPublicKeySecurityHandler.cs
#	src/core/iTextSharp/text/pdf/crypto/AESCipher.cs
#	src/core/iTextSharp/text/pdf/crypto/AESCipherCBCnoPad.cs
#	src/core/iTextSharp/text/pdf/security/CertificateVerification.cs
#	src/core/iTextSharp/text/pdf/security/OcspClientBouncyCastle.cs
#	src/core/iTextSharp/text/pdf/security/OcspVerifier.cs
#	src/core/iTextSharp/text/pdf/security/PdfPKCS7.cs
#	src/core/iTextSharp/text/pdf/security/SignaturePolicyInfo.cs
#	src/core/iTextSharp/xmp/impl/XmpSerializerRdf.cs
#	src/core/itextsharp(VS2010).csproj
#	src/extras/iTextAsian/iTextAsian(VS2010).csproj
#	src/extras/iTextSharp.xtra/Properties/AssemblyInfo.cs
#	src/extras/iTextSharp.xtra/iTextSharp.xtra(VS2010).csproj
#	src/extras/itext-hyph-xml/itext-hyph-xml(VS2010).csproj
#	src/extras/itextsharp.pdfa.tests/Properties/AssemblyInfo.cs
#	src/extras/itextsharp.pdfa.tests/itextsharp.pdfa.tests(VS2010).csproj
#	src/extras/itextsharp.pdfa/Properties/AssemblyInfo.cs
#	src/extras/itextsharp.pdfa/itextsharp.pdfa(VS2010).csproj
#	src/extras/itextsharp.tests/Properties/AssemblyInfo.cs
#	src/extras/itextsharp.tests/itextsharp.tests(VS2010).csproj
#	src/extras/itextsharp.tests/packages.config
#	src/extras/itextsharp.xmlworker.tests/Properties/AssemblyInfo.cs
#	src/extras/itextsharp.xmlworker.tests/itextsharp.xmlworker.tests(VS2010).csproj
#	src/extras/itextsharp.xmlworker/Properties/AssemblyInfo.cs
#	src/extras/itextsharp.xmlworker/itextsharp.xmlworker(VS2010).csproj

Author: danielgindi

README.md

@@ -1,4 +1,4 @@
-### **PLEASE NOTE: iTextSharp is EOL, and has been replaced by [iText 7][itext7]. Only security fixes will be added**
+### **PLEASE NOTE: iTextSharp is EOL, and has been replaced by [iText 7][itext]. Only security fixes will be added**
 
 We HIGHLY recommend customers use iText 7 for new projects, and to consider moving existing projects from iTextSharp to iText 7 to benefit from the many improvements such as:
 
@@ -51,4 +51,4 @@ Contact sales for more info: http://itextpdf.com/sales
 [building]: BUILDING.md
 [gratis]: https://en.wikipedia.org/wiki/Gratis_versus_libre
 [itext]: http://itextpdf.com/
-[itext7]: https://github.com/itext/itext7-dotnet
+[itext]: https://github.com/itext/itext-dotnet

iTextAsian.nuspec

@@ -10,9 +10,9 @@
     <projectUrl>https://itextpdf.com/</projectUrl>
     <iconUrl>https://itextpdf.com/sites/default/files/ITSC-avatar.png</iconUrl>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
-    <description>PLEASE NOTE: iTextSharp is EOL, and has been replaced by iText 7. Only security fixes will be added
+    <description>PLEASE NOTE: iTextSharp is EOL, and has been replaced by iText. Only security fixes will be added
 
-We HIGHLY recommend customers use iText 7 for new projects, and to consider moving existing projects from iTextSharp to iText 7 to benefit from the many improvements such as:
+We HIGHLY recommend customers use iText for new projects, and to consider moving existing projects from iTextSharp to iText to benefit from the many improvements such as:
 - HTML to PDF (PDF/A) conversion
 - PDF Redaction
 - SVG support
@@ -24,15 +24,15 @@ We HIGHLY recommend customers use iText 7 for new projects, and to consider movi
 - Extra practical add-ons
 - Encryption, hashing and digital signatures
 
-This DEPRECATED library adds extra functionality for iTextSharp. Please use iText 7 instead. iText 7 Community: https://www.nuget.org/packages/itext7/ and iText 7 pdfSweep addon: https://www.nuget.org/packages/itext7.pdfsweep/</description>
-    <summary>Extra functionality for DEPRECACTED iTextSharp PDF generation library written entirely in C# for the .NET platform. Please use iText 7 instead.
-iText 7 Community: https://www.nuget.org/packages/itext7/</summary>
+This DEPRECATED library adds extra functionality for iTextSharp. Please use iText instead. iText Community: https://www.nuget.org/packages/itext/ and iText pdfSweep addon: https://www.nuget.org/packages/itext.pdfsweep/</description>
+    <summary>Extra functionality for DEPRECACTED iTextSharp PDF generation library written entirely in C# for the .NET platform. Please use iText instead.
+iText Community: https://www.nuget.org/packages/itext/</summary>
     <copyright>Copyright (c) 1998-2022 iText Group NV</copyright>
     <language>en-US</language>
     <tags>itext itextsharp c# csharp .net pdf</tags>
   </metadata>
 
   <files>
-    <file src="src\extras\iTextAsian\bin\Release\iTextAsian.dll" target="lib\" />
+    <file src="src\extras\iTextAsian\bin\Release\net461\iTextAsian.dll" target="lib\net461" />
   </files>
 </package>

itext-hyph-xml.nuspec

@@ -10,9 +10,9 @@
     <projectUrl>https://itextpdf.com/</projectUrl>
     <iconUrl>https://itextpdf.com/sites/default/files/ITSC-avatar.png</iconUrl>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
-    <description>PLEASE NOTE: iTextSharp is EOL, and has been replaced by iText 7. Only security fixes will be added
+    <description>PLEASE NOTE: iTextSharp is EOL, and has been replaced by iText. Only security fixes will be added
 
-We HIGHLY recommend customers use iText 7 for new projects, and to consider moving existing projects from iTextSharp to iText 7 to benefit from the many improvements such as:
+We HIGHLY recommend customers use iText for new projects, and to consider moving existing projects from iTextSharp to iText to benefit from the many improvements such as:
 - HTML to PDF (PDF/A) conversion
 - PDF Redaction
 - SVG support
@@ -24,15 +24,15 @@ We HIGHLY recommend customers use iText 7 for new projects, and to consider movi
 - Extra practical add-ons
 - Encryption, hashing and digital signatures
 
-This DEPRECATED library adds extra functionality for iTextSharp. Please use iText 7 instead. iText 7 Community: https://www.nuget.org/packages/itext7/ and iText 7 pdfSweep addon: https://www.nuget.org/packages/itext7.pdfsweep/</description>
-    <summary>Extra functionality for DEPRECACTED iTextSharp PDF generation library written entirely in C# for the .NET platform. Please use iText 7 instead.
-iText 7 Community: https://www.nuget.org/packages/itext7/</summary>
+This DEPRECATED library adds extra functionality for iTextSharp. Please use iText instead. iText Community: https://www.nuget.org/packages/itext/ and iText pdfSweep addon: https://www.nuget.org/packages/itext.pdfsweep/</description>
+    <summary>Extra functionality for DEPRECACTED iTextSharp PDF generation library written entirely in C# for the .NET platform. Please use iText instead.
+iText Community: https://www.nuget.org/packages/itext/</summary>
     <copyright>Copyright (c) 1998-2022 iText Group NV</copyright>
     <language>en-US</language>
     <tags>itext itextsharp c# csharp .net pdf</tags>
   </metadata>
 
   <files>
-    <file src="src\extras\itext-hyph-xml\bin\Release\itext-hyph-xml.dll" target="lib\" />
+    <file src="src\extras\itext-hyph-xml\bin\Release\net461\itext-hyph-xml.dll" target="lib\net461" />
   </files>
 </package>

itextsharp.nuspec

@@ -2,17 +2,17 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
   <metadata>
     <id>iTextSharp.portable</id>
-    <version>5.5.13.3</version>
+    <version>5.5.13.4</version>
     <title>iTextSharp Portable</title>
     <authors>iText Software</authors>
     <owners>Bruno Lowagie,Paulo Soares</owners>
     <licenseUrl>https://www.gnu.org/licenses/agpl.html</licenseUrl>
     <projectUrl>https://itextpdf.com/</projectUrl>
     <iconUrl>https://itextpdf.com/sites/default/files/ITSC-avatar.png</iconUrl>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
-    <description>PLEASE NOTE: iTextSharp is EOL, and has been replaced by iText 7. Only security fixes will be added
+    <description>PLEASE NOTE: iTextSharp is EOL, and has been replaced by iText. Only security fixes will be added
 
-We HIGHLY recommend customers use iText 7 for new projects, and to consider moving existing projects from iTextSharp to iText 7 to benefit from the many improvements such as:
+We HIGHLY recommend customers use iText for new projects, and to consider moving existing projects from iTextSharp to iText to benefit from the many improvements such as:
 - HTML to PDF (PDF/A) conversion
 - PDF Redaction
 - SVG support
@@ -26,26 +26,28 @@ We HIGHLY recommend customers use iText 7 for new projects, and to consider movi
 
 iText is a PDF library that allows you to CREATE, ADAPT, INSPECT and MAINTAIN documents in the Portable Document Format (PDF), allowing you to add PDF functionality to your software projects with ease.  We even have documentation to help you get coding.
 
-iText 7 is available under AGPL and Commercial license. iText 7 Community: https://www.nuget.org/packages/itext7/
+iText is available under AGPL and Commercial license. iText Community: https://www.nuget.org/packages/itext/
 
-iText 7 is a complete re-write of iText 5, allowing you to choose your adventure with add-ons, all based on a simple, modular code structure that is easy to use and well documented.
+iText is a complete re-write of iText 5, allowing you to choose your adventure with add-ons, all based on a simple, modular code structure that is easy to use and well documented.
 
-iText 7 includes pdfDebug, the first debugging tool that gives you a clear overview of your content streams and document structure as well as pdfCalligraph, allowing you to leverage advanced typography.
+iText includes pdfDebug, the first debugging tool that gives you a clear overview of your content streams and document structure as well as pdfCalligraph, allowing you to leverage advanced typography.
 
 Several iText engineers are actively supporting the project on StackOverflow: https://stackoverflow.com/questions/tagged/itext</description>
-    <summary>iTextSharp is a DEPRECATED library for PDF generation written entirely in C# for the .NET platform. Please use iText 7 instead.
-iText 7 Community: https://www.nuget.org/packages/itext7/</summary>
+    <summary>iTextSharp is a DEPRECATED library for PDF generation written entirely in C# for the .NET platform. Please use iText instead.
+iText Community: https://www.nuget.org/packages/itext/</summary>
     <copyright>Copyright (c) 1998-2022 iText Group NV</copyright>
     <language>en-US</language>
     <tags>itext itextsharp c# .net csharp pdf</tags>
-	<dependencies>
-      <dependency id="BouncyCastle" version="1.8.9" />
+    <dependencies>
+      <group targetFramework="net461">
+        <dependency id="BouncyCastle.Cryptography" version="2.4.0" />
+      </group>
     </dependencies>
   </metadata>
 
   <files>
-    <file src="src\core\bin\Release\itextsharp.dll" target="lib\" />
-    <file src="src\core\bin\Release\itextsharp.xml" target="lib\" />
+    <file src="src\core\bin\Release\net461\itextsharp.dll" target="lib\net461" />
+    <file src="src\core\bin\Release\net461\itextsharp.xml" target="lib\net461" />
     <file src="src\notice.txt" target="" />
     <file src="gnu-agpl-v3.0.md" target="" />
     <file src="LICENSE.md" target="" />

itextsharp.pdfa.nuspec

@@ -2,17 +2,17 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
   <metadata>
     <id>itextsharp.pdfa.portable</id>
-    <version>5.5.13.3</version>
+    <version>5.5.13.4</version>
     <title>iTextSharp.pdfa Portable</title>
     <authors>iText Software</authors>
     <owners>Bruno Lowagie,Paulo Soares,et al.</owners>
     <licenseUrl>https://www.gnu.org/licenses/agpl.html</licenseUrl>
     <projectUrl>https://itextpdf.com/</projectUrl>
     <iconUrl>https://itextpdf.com/sites/default/files/ITSC-avatar.png</iconUrl>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
-    <description>PLEASE NOTE: iTextSharp is EOL, and has been replaced by iText 7. Only security fixes will be added
+    <description>PLEASE NOTE: iTextSharp is EOL, and has been replaced by iText. Only security fixes will be added
 
-We HIGHLY recommend customers use iText 7 for new projects, and to consider moving existing projects from iTextSharp to iText 7 to benefit from the many improvements such as:
+We HIGHLY recommend customers use iText for new projects, and to consider moving existing projects from iTextSharp to iText to benefit from the many improvements such as:
 - HTML to PDF (PDF/A) conversion
 - PDF Redaction
 - SVG support
@@ -24,19 +24,19 @@ We HIGHLY recommend customers use iText 7 for new projects, and to consider movi
 - Extra practical add-ons
 - Encryption, hashing and digital signatures
 
-The iTextSharp.pdfa adds PDF/A-related functionality for iTextSharp. The same funcionality is present in pdfa module of iText 7 Community: https://www.nuget.org/packages/itext7/</description>
-    <summary>Extra functionality for DEPRECATED iTextSharp library for PDF generation written entirely in C# for the .NET platform. Please use itext7 instead.
-iText 7 Community: https://www.nuget.org/packages/itext7/</summary>
+The iTextSharp.pdfa adds PDF/A-related functionality for iTextSharp. The same funcionality is present in pdfa module of iText Community: https://www.nuget.org/packages/itext/</description>
+    <summary>Extra functionality for DEPRECATED iTextSharp library for PDF generation written entirely in C# for the .NET platform. Please use itext instead.
+iText Community: https://www.nuget.org/packages/itext/</summary>
     <copyright>Copyright (c) 1998-2022 iText Group NV</copyright>
     <language>en-US</language>
     <tags>itext itextsharp c# csharp .net pdf pdfa</tags>
     <dependencies>
-      <dependency id="iTextSharp" version="5.5.13.3" />
+      <dependency id="iTextSharp" version="5.5.13.4" />
     </dependencies>
   </metadata>
 
-  <files> 
-    <file src="src\extras\itextsharp.pdfa\bin\Release\itextsharp.pdfa.dll" target="lib\" />
+  <files>
+    <file src="src\extras\itextsharp.pdfa\bin\Release\net461\itextsharp.pdfa.dll" target="lib\net461" />
     <file src="gnu-agpl-v3.0.md" target="" />
     <file src="LICENSE.md" target="" />
   </files>

itextsharp.xmlworker.nuspec

@@ -2,17 +2,17 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
   <metadata>
     <id>itextsharp.xmlworker.portable</id>
-    <version>5.5.13.3</version>
+    <version>5.5.13.4</version>
     <title>iTextSharp XML Worker Portable</title>
     <authors>iText Software</authors>
     <owners>Bruno Lowagie,Paulo Soares,et al.</owners>
     <licenseUrl>https://www.gnu.org/licenses/agpl.html</licenseUrl>
     <projectUrl>https://itextpdf.com/</projectUrl>
     <iconUrl>https://itextpdf.com/sites/default/files/ITSC-avatar.png</iconUrl>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
-    <description>PLEASE NOTE: iTextSharp is EOL, and has been replaced by iText 7. Only security fixes will be added
+    <description>PLEASE NOTE: iTextSharp is EOL, and has been replaced by iText. Only security fixes will be added
 
-We HIGHLY recommend customers use iText 7 for new projects, and to consider moving existing projects from iTextSharp to iText 7 to benefit from the many improvements such as:
+We HIGHLY recommend customers use iText for new projects, and to consider moving existing projects from iTextSharp to iText to benefit from the many improvements such as:
 - HTML to PDF (PDF/A) conversion
 - PDF Redaction
 - SVG support
@@ -24,20 +24,20 @@ We HIGHLY recommend customers use iText 7 for new projects, and to consider movi
 - Extra practical add-ons
 - Encryption, hashing and digital signatures
 
-This DEPRECATED tool parses (X)HTML snippets and the associated CSS and converts them to PDF. It is replaced by iText7 pdfHTML addon https://www.nuget.org/packages/itext7.pdfhtml/ and iText 7 Community: https://www.nuget.org/packages/itext7/
+This DEPRECATED tool parses (X)HTML snippets and the associated CSS and converts them to PDF. It is replaced by iText pdfHTML addon https://www.nuget.org/packages/itext.pdfhtml/ and iText Community: https://www.nuget.org/packages/itext/
 
 XMLWorker is an extra component for iTextSharp. The first XML to PDF implementation, is a new version of the old HTMLWorker that used to be shipped with iTextSharp.</description>
-    <summary>This DEPRECATED tool parses (X)HTML snippets and the associated CSS and converts them to PDF. It is replaced by iText 7 pdfHTML addon https://www.nuget.org/packages/itext7.pdfhtml/ and iText 7 Community: https://www.nuget.org/packages/itext7/</summary>
+    <summary>This DEPRECATED tool parses (X)HTML snippets and the associated CSS and converts them to PDF. It is replaced by iText pdfHTML addon https://www.nuget.org/packages/itext.pdfhtml/ and iText Community: https://www.nuget.org/packages/itext/</summary>
     <copyright>Copyright (c) 1998-2022 iText Group NV</copyright>
     <language>en-US</language>
     <tags>itext itextsharp c# csharp xml worker pdf html xhtml css</tags>
     <dependencies>
-      <dependency id="iTextSharp" version="5.5.13.3" />
+      <dependency id="iTextSharp" version="5.5.13.4" />
     </dependencies>
   </metadata>
 
   <files>
-    <file src="src\extras\itextsharp.xmlworker\bin\Release\itextsharp.xmlworker.dll" target="lib\" />
+    <file src="src\extras\itextsharp.xmlworker\bin\Release\net461\itextsharp.xmlworker.dll" target="lib\net461" />
     <file src="gnu-agpl-v3.0.md" target="" />
     <file src="LICENSE.md" target="" />
   </files>

itextsharp.xtra.nuspec

@@ -2,17 +2,17 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
   <metadata>
     <id>itextsharp.xtra.portable</id>
-    <version>5.5.13.3</version>
+    <version>5.5.13.4</version>
     <title>iTextSharp.xtra Portable</title>
     <authors>iText Software</authors>
     <owners>Bruno Lowagie,Paulo Soares,et al.</owners>
     <licenseUrl>https://www.gnu.org/licenses/agpl.html</licenseUrl>
     <projectUrl>https://itextpdf.com/</projectUrl>
     <iconUrl>https://itextpdf.com/sites/default/files/ITSC-avatar.png</iconUrl>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
-    <description>PLEASE NOTE: iTextSharp is EOL, and has been replaced by iText 7. Only security fixes will be added
+    <description>PLEASE NOTE: iTextSharp is EOL, and has been replaced by iText. Only security fixes will be added
 
-We HIGHLY recommend customers use iText 7 for new projects, and to consider moving existing projects from iTextSharp to iText 7 to benefit from the many improvements such as:
+We HIGHLY recommend customers use iText for new projects, and to consider moving existing projects from iTextSharp to iText to benefit from the many improvements such as:
 - HTML to PDF (PDF/A) conversion
 - PDF Redaction
 - SVG support
@@ -24,19 +24,19 @@ We HIGHLY recommend customers use iText 7 for new projects, and to consider movi
 - Extra practical add-ons
 - Encryption, hashing and digital signatures
 
-This DEPRECATED library adds extra functionality for iTextSharp. Please use iText 7 instead. iText 7 Community: https://www.nuget.org/packages/itext7/ and iText 7 pdfSweep addon: https://www.nuget.org/packages/itext7.pdfsweep/</description>
-    <summary>Extra functionality for DEPRECACTED iTextSharp PDF generation library written entirely in C# for the .NET platform. Please use iText 7 instead.
-iText 7 Community: https://www.nuget.org/packages/itext7/</summary>
+This DEPRECATED library adds extra functionality for iTextSharp. Please use iText instead. iText Community: https://www.nuget.org/packages/itext/ and iText pdfSweep addon: https://www.nuget.org/packages/itext.pdfsweep/</description>
+    <summary>Extra functionality for DEPRECACTED iTextSharp PDF generation library written entirely in C# for the .NET platform. Please use iText instead.
+iText Community: https://www.nuget.org/packages/itext/</summary>
     <copyright>Copyright (c) 1998-2022 iText Group NV</copyright>
     <language>en-US</language>
     <tags>itext itextsharp c# csharp .net pdf</tags>
     <dependencies>
-      <dependency id="iTextSharp" version="5.5.13.3" />
+      <dependency id="iTextSharp" version="5.5.13.4" />
     </dependencies>
   </metadata>
 
   <files>
-    <file src="src\extras\itextsharp.xtra\bin\Release\itextsharp.xtra.dll" target="lib\" />
+    <file src="src\extras\itextsharp.xtra\bin\Release\net461\itextsharp.xtra.dll" target="lib\net461" />
     <file src="gnu-agpl-v3.0.md" target="" />
     <file src="LICENSE.md" target="" />
   </files>