Fix finger print logic

DEVSIX-5902

Autoported commit.
Original commit hash: [e7628e42c]

Author: introfog

itext.tests/itext.commons.tests/itext/commons/actions/data/CommonsProductDataTest.cs

@@ -27,11 +27,15 @@ public class CommonsProductDataTest : ExtendedITextTest {
         [NUnit.Framework.Test]
         public virtual void GetInstanceTest() {
             ProductData commonsProductData = CommonsProductData.GetInstance();
-            NUnit.Framework.Assert.AreEqual("Commons", commonsProductData.GetPublicProductName());
-            NUnit.Framework.Assert.AreEqual("commons", commonsProductData.GetProductName());
-            NUnit.Framework.Assert.AreEqual("7.2.0-SNAPSHOT", commonsProductData.GetVersion());
-            NUnit.Framework.Assert.AreEqual(2000, commonsProductData.GetSinceCopyrightYear());
-            NUnit.Framework.Assert.AreEqual(2021, commonsProductData.GetToCopyrightYear());
+            NUnit.Framework.Assert.AreEqual(CommonsProductData.COMMONS_PUBLIC_PRODUCT_NAME, commonsProductData.GetPublicProductName
+                ());
+            NUnit.Framework.Assert.AreEqual(CommonsProductData.COMMONS_PRODUCT_NAME, commonsProductData.GetProductName
+                ());
+            NUnit.Framework.Assert.AreEqual(CommonsProductData.COMMONS_VERSION, commonsProductData.GetVersion());
+            NUnit.Framework.Assert.AreEqual(CommonsProductData.COMMONS_COPYRIGHT_SINCE, commonsProductData.GetSinceCopyrightYear
+                ());
+            NUnit.Framework.Assert.AreEqual(CommonsProductData.COMMONS_COPYRIGHT_TO, commonsProductData.GetToCopyrightYear
+                ());
         }
     }
 }

itext.tests/itext.kernel.tests/itext/kernel/pdf/TrailerTest.cs

@@ -44,6 +44,7 @@ source product.
 using System.IO;
 using iText.Commons.Actions.Data;
 using iText.Commons.Utils;
+using iText.Kernel.Actions.Data;
 using iText.Kernel.Font;
 using iText.Kernel.Pdf.Canvas;
 using iText.Test;
@@ -81,27 +82,26 @@ public virtual void TrailerFingerprintTest() {
         }
 
         private bool DoesTrailerContainFingerprint(FileInfo file, String fingerPrint) {
-            FileStream raf = FileUtil.GetRandomAccessFile(file);
-            // put the pointer at the end of the file
-            raf.Seek(raf.Length);
-            // look for coreProductData
-            String coreProductData = "%iText-Core-7.2.0-SNAPSHOT";
-            String templine = "";
-            while (!templine.Contains(coreProductData)) {
-                templine = (char)raf.ReadByte() + templine;
-                raf.Seek(raf.Position - 2);
+            using (FileStream raf = FileUtil.GetRandomAccessFile(file)) {
+                // put the pointer at the end of the file
+                raf.Seek(raf.Length);
+                // look for coreProductData
+                String coreProductData = "%iText-Core-" + ITextCoreProductData.GetInstance().GetVersion();
+                String templine = "";
+                while (!templine.Contains(coreProductData)) {
+                    templine = (char)raf.ReadByte() + templine;
+                    raf.Seek(raf.Position - 2);
+                }
+                // look for fingerprint
+                char read = ' ';
+                templine = "";
+                while (read != '%') {
+                    read = (char)raf.ReadByte();
+                    templine = read + templine;
+                    raf.Seek(raf.Position - 2);
+                }
+                return templine.Contains(fingerPrint);
             }
-            // look for fingerprint
-            char read = ' ';
-            templine = "";
-            while (read != '%') {
-                read = (char)raf.ReadByte();
-                templine = read + templine;
-                raf.Seek(raf.Position - 2);
-            }
-            bool output = templine.Contains(fingerPrint);
-            raf.Dispose();
-            return output;
         }
     }
 }

itext/itext.commons/itext/commons/actions/data/CommonsProductData.cs

@@ -29,15 +29,15 @@ namespace iText.Commons.Actions.Data {
     /// related to iText commons module.
     /// </summary>
     public sealed class CommonsProductData {
-        private const String COMMONS_PUBLIC_PRODUCT_NAME = "Commons";
+        internal const String COMMONS_PUBLIC_PRODUCT_NAME = "Commons";
 
-        private const String COMMONS_PRODUCT_NAME = "commons";
+        internal const String COMMONS_PRODUCT_NAME = "commons";
 
-        private const String COMMONS_VERSION = "7.2.0-SNAPSHOT";
+        internal const String COMMONS_VERSION = "7.2.0-SNAPSHOT";
 
-        private const int COMMONS_COPYRIGHT_SINCE = 2000;
+        internal const int COMMONS_COPYRIGHT_SINCE = 2000;
 
-        private const int COMMONS_COPYRIGHT_TO = 2021;
+        internal const int COMMONS_COPYRIGHT_TO = 2021;
 
         private static readonly ProductData COMMONS_PRODUCT_DATA = new ProductData(COMMONS_PUBLIC_PRODUCT_NAME, COMMONS_PRODUCT_NAME
             , COMMONS_VERSION, COMMONS_COPYRIGHT_SINCE, COMMONS_COPYRIGHT_TO);

itext/itext.kernel/itext/kernel/pdf/PdfXrefTable.cs

@@ -473,13 +473,13 @@ private int GetOffsetSize(long startxref) {
         /// <param name="document">pdfDocument to write the fingerprint to</param>
         protected internal static void WriteKeyInfo(PdfDocument document) {
             PdfWriter writer = document.GetWriter();
-            FingerPrint fingerPrint = document.GetFingerPrint();
-            if (fingerPrint.GetProducts().IsEmpty()) {
-                writer.WriteString(MessageFormatUtil.Format("%iText-{0}-no-registered-products", ITextCoreProductData.GetInstance
+            ICollection<ProductData> products = document.GetFingerPrint().GetProducts();
+            if (products.IsEmpty()) {
+                writer.WriteString(MessageFormatUtil.Format("%iText-{0}-no-registered-products\n", ITextCoreProductData.GetInstance
                     ().GetVersion()));
             }
             else {
-                foreach (ProductData productData in fingerPrint.GetProducts()) {
+                foreach (ProductData productData in products) {
                     writer.WriteString(MessageFormatUtil.Format("%iText-{0}-{1}\n", productData.GetPublicProductName(), productData
                         .GetVersion()));
                 }

port-hash

@@ -1 +1 @@
-9da3a4342a9ec9a6c9addfa2c344785b1cdb316a
+e7628e42ca07c223a5a1d9a5df9da7aa5f0a010d