Merge branch 'develop' into devsecops

Author: aleks-ivanov

itext.tests/itext.sign.tests/itext/signatures/CertificateInfoTest.cs

@@ -24,8 +24,12 @@ You should have received a copy of the GNU Affero General Public License
 using System.Collections.Generic;
 using iText.Bouncycastleconnector;
 using iText.Commons.Bouncycastle;
+using iText.Commons.Bouncycastle.Asn1.X500;
+using iText.Commons.Bouncycastle.Cert;
 using iText.Commons.Utils;
 using iText.Kernel.Exceptions;
+using iText.Kernel.Pdf;
+using iText.Signatures.Testutils;
 using iText.Test;
 
 namespace iText.Signatures {
@@ -36,6 +40,14 @@ public class CertificateInfoTest : ExtendedITextTest {
         private static readonly String EXPECTED_EXCEPTION_MESSAGE = FACTORY.GetBouncyCastleFactoryTestUtil().GetCertificateInfoTestConst
             ();
 
+        private const String ENCODED_DN = "MD0xCzAJBgNVBAYMAkJFMQ4wDAYDVQQKDAVpVGV4dDEeMBwGA1UEAwwVaVRleHRUZXN0SW50ZXJtZWRpYXRl";
+
+        private static readonly String CERTS_SRC = iText.Test.TestUtil.GetParentProjectDirectory(NUnit.Framework.TestContext
+            .CurrentContext.TestDirectory) + "/resources/itext/signatures/certs/";
+
+        private static readonly String SOURCE_FOLDER = iText.Test.TestUtil.GetParentProjectDirectory(NUnit.Framework.TestContext
+            .CurrentContext.TestDirectory) + "/resources/itext/signatures" + "/CertificateInfoTest/";
+
         [NUnit.Framework.Test]
         public virtual void X500InvalidDirectoryConstructorTest() {
             NUnit.Framework.Assert.Catch(typeof(ArgumentException), () => new CertificateInfo.X500Name("some_dir"));
@@ -86,5 +98,28 @@ public virtual void GetSubjectExceptionTest() {
                 new byte[] { 4, 8, 15, 16, 23, 42 }));
             NUnit.Framework.Assert.AreEqual(EXPECTED_EXCEPTION_MESSAGE, exception.InnerException.Message);
         }
+
+        [NUnit.Framework.Test]
+        public virtual void DistinguishedNameEncodingAndComparisonTest() {
+            IX509Certificate cert = (IX509Certificate)PemFileHelper.ReadFirstChain(CERTS_SRC + "intermediate.pem")[0];
+            IX500Name name = FACTORY.CreateX500Name(cert);
+            IX500Name differentlyEncodedName = FACTORY.CreateX500Name(FACTORY.CreateASN1Sequence(Convert.FromBase64String
+                (ENCODED_DN)));
+            NUnit.Framework.Assert.IsTrue(differentlyEncodedName.Equals(name));
+            NUnit.Framework.Assert.IsTrue(name.Equals(differentlyEncodedName));
+        }
+
+        [NUnit.Framework.Test]
+        public virtual void DistinguishedNameEncodingAndComparisonIntegrationTest() {
+            NUnit.Framework.Assert.DoesNotThrow(() => {
+                PdfDocument doc = new PdfDocument(new PdfReader(SOURCE_FOLDER + "signatureWithNameEncodingDifferences.pdf"
+                    ));
+                SignatureUtil signUtil = new SignatureUtil(doc);
+                IList<String> signNames = signUtil.GetSignatureNames();
+                PdfPKCS7 pkcs7 = signUtil.ReadSignatureData(signNames[0]);
+                NUnit.Framework.Assert.IsNotNull(pkcs7);
+            }
+            );
+        }
     }
 }

itext.tests/itext.sign.tests/resources/itext/signatures/CertificateInfoTest/signatureWithNameEncodingDifferences.pdf

@@ -56,5 +56,19 @@ public string GetName()
         {
             return GetX509Name().ToString();
         }
+
+        public override bool Equals(object o)
+        {
+            if (this == o)
+            {
+                return true;
+            }
+            if (o == null || !this.GetType().IsAssignableFrom(o.GetType()))
+            {
+                return false;
+            }
+            X509NameBC that = (X509NameBC)o;
+            return GetX509Name().Equivalent(that.GetX509Name());
+        }
     }
 }

itext/itext.bouncy-castle-adapter/itext/bouncycastle/asn1/x509/X509NameBC.cs

@@ -23,6 +23,7 @@ You should have received a copy of the GNU Affero General Public License
 
 using iText.Commons.Bouncycastle.Asn1.X500;
 using Org.BouncyCastle.Asn1.X500;
+using System;
 
 namespace iText.Bouncycastlefips.Asn1.X500 {
     /// <summary>
@@ -56,5 +57,19 @@ public string GetName()
         {
             return GetX500Name().ToString();
         }
+
+        public override bool Equals(object o)
+        {
+            if (this == o)
+            {
+                return true;
+            }
+            if (o == null || !this.GetType().IsAssignableFrom(o.GetType()))
+            {
+                return false;
+            }
+            X500NameBCFips that = (X500NameBCFips)o;
+            return GetX500Name().Equivalent(that.GetX500Name());
+        }
     }
 }

itext/itext.bouncy-castle-fips-adapter/itext/bouncycastlefips/asn1/x500/X500NameBCFips.cs

@@ -1 +1 @@
-0d8eb131608fed1576fd00603cfb4797f36a77fc
+a57dd49bf5d453f6e84783e27122aef1f9ceb483