Update java bc library to 1.75

vitali-pr · Dmitry Radchuk · commit 5e7aad17e4aa · 2023-11-20T03:32:57.000+03:00
DEVSIX-7663
diff --git a/forms/pom.xml b/forms/pom.xml
@@ -34,14 +34,14 @@
     </dependency>
     <dependency>
       <groupId>org.bouncycastle</groupId>
-      <artifactId>bcpkix-jdk15on</artifactId>
+      <artifactId>bcpkix-jdk18on</artifactId>
       <version>${bouncycastle.version}</version>
       <scope>test</scope>
       <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.bouncycastle</groupId>
-      <artifactId>bcprov-jdk15on</artifactId>
+      <artifactId>bcprov-jdk18on</artifactId>
       <version>${bouncycastle.version}</version>
       <scope>test</scope>
       <optional>true</optional>
diff --git a/kernel/pom.xml b/kernel/pom.xml
@@ -20,12 +20,12 @@
     </dependency>
     <dependency>
       <groupId>org.bouncycastle</groupId>
-      <artifactId>bcpkix-jdk15on</artifactId>
+      <artifactId>bcpkix-jdk18on</artifactId>
       <version>${bouncycastle.version}</version>
     </dependency>
     <dependency>
       <groupId>org.bouncycastle</groupId>
-      <artifactId>bcprov-jdk15on</artifactId>
+      <artifactId>bcprov-jdk18on</artifactId>
       <version>${bouncycastle.version}</version>
     </dependency>
     <dependency>
diff --git a/pom.xml b/pom.xml
@@ -71,7 +71,7 @@
 
   <properties>
     <argLine>-Xmx1024m</argLine>
-    <bouncycastle.version>1.68</bouncycastle.version>
+    <bouncycastle.version>1.75</bouncycastle.version>
     <dependencyCheck.version>6.0.3</dependencyCheck.version>
     <failsafe.version>3.0.0-M3</failsafe.version>
     <integrationtests>com.itextpdf.test.annotations.type.IntegrationTest</integrationtests>
diff --git a/sign/pom.xml b/sign/pom.xml
@@ -32,13 +32,13 @@
     </dependency>
     <dependency>
       <groupId>org.bouncycastle</groupId>
-      <artifactId>bcpkix-jdk15on</artifactId>
+      <artifactId>bcpkix-jdk18on</artifactId>
       <version>${bouncycastle.version}</version>
       <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.bouncycastle</groupId>
-      <artifactId>bcprov-jdk15on</artifactId>
+      <artifactId>bcprov-jdk18on</artifactId>
       <version>${bouncycastle.version}</version>
       <optional>true</optional>
     </dependency>
diff --git a/sign/src/main/java/com/itextpdf/signatures/CertificateUtil.java b/sign/src/main/java/com/itextpdf/signatures/CertificateUtil.java
@@ -119,7 +119,7 @@ public static String getCRLURL(X509Certificate certificate) throws CertificatePa
                 if (name.getTagNo() != GeneralName.uniformResourceIdentifier) {
                     continue;
                 }
-                DERIA5String derStr = DERIA5String.getInstance((ASN1TaggedObject)name.toASN1Primitive(), false);
+                DERIA5String derStr = (DERIA5String)DERIA5String.getInstance((ASN1TaggedObject)name.toASN1Primitive(), false);
                 return derStr.getString();
             }
         }
diff --git a/sign/src/main/java/com/itextpdf/signatures/PdfPKCS7.java b/sign/src/main/java/com/itextpdf/signatures/PdfPKCS7.java
@@ -270,7 +270,7 @@ public PdfPKCS7(byte[] contentsKey, PdfName filterSubtype, String provider) {
             ASN1ObjectIdentifier objId = (ASN1ObjectIdentifier) signedData.getObjectAt(0);
             if (!objId.getId().equals(SecurityIDs.ID_PKCS7_SIGNED_DATA))
                 throw new IllegalArgumentException(PdfException.NotAValidPkcs7ObjectNotSignedData);
-            ASN1Sequence content = (ASN1Sequence) ((ASN1TaggedObject) signedData.getObjectAt(1)).getObject();
+            ASN1Sequence content = (ASN1Sequence) ((ASN1TaggedObject) signedData.getObjectAt(1)).getBaseObject().toASN1Primitive();
             // the positions that we care are:
             //     0 - version
             //     1 - digestAlgorithms
@@ -293,7 +293,7 @@ public PdfPKCS7(byte[] contentsKey, PdfName filterSubtype, String provider) {
             // the possible ID_PKCS7_DATA
             ASN1Sequence rsaData = (ASN1Sequence) content.getObjectAt(2);
             if (rsaData.size() > 1) {
-                ASN1OctetString rsaDataContent = (ASN1OctetString) ((ASN1TaggedObject) rsaData.getObjectAt(1)).getObject();
+                ASN1OctetString rsaDataContent = (ASN1OctetString) ((ASN1TaggedObject) rsaData.getObjectAt(1)).getBaseObject().toASN1Primitive();
                 this.rsaData = rsaDataContent.getOctets();
             }
 
@@ -390,11 +390,11 @@ public PdfPKCS7(byte[] contentsKey, PdfName filterSubtype, String provider) {
                         for (int j = 0; j < seqout.size(); ++j) {
                             ASN1TaggedObject tg = (ASN1TaggedObject) seqout.getObjectAt(j);
                             if (tg.getTagNo() == 0) {
-                                ASN1Sequence seqin = (ASN1Sequence) tg.getObject();
+                                ASN1Sequence seqin = (ASN1Sequence) tg.getBaseObject().toASN1Primitive();
                                 findCRL(seqin);
                             }
                             if (tg.getTagNo() == 1) {
-                                ASN1Sequence seqin = (ASN1Sequence) tg.getObject();
+                                ASN1Sequence seqin = (ASN1Sequence) tg.getBaseObject().toASN1Primitive();
                                 findOcsp(seqin);
                             }
                         }
@@ -761,7 +761,7 @@ public byte[] getEncodedPKCS1() {
                 digest = sig.sign();
             ByteArrayOutputStream bOut = new ByteArrayOutputStream();
 
-            ASN1OutputStream dout = new ASN1OutputStream(bOut);
+            ASN1OutputStream dout = ASN1OutputStream.create(bOut);
             dout.writeObject(new DEROctetString(digest));
             dout.close();
 
@@ -947,7 +947,7 @@ public byte[] getEncodedPKCS7(byte[] secondDigest, PdfSigner.CryptoStandard sigt
 
             ByteArrayOutputStream bOut = new ByteArrayOutputStream();
 
-            ASN1OutputStream dout = new ASN1OutputStream(bOut);
+            ASN1OutputStream dout = ASN1OutputStream.create(bOut);
             dout.writeObject(new DERSequence(whole));
             dout.close();
 
@@ -1457,8 +1457,8 @@ private void findOcsp(ASN1Sequence seq) throws IOException {
                 }
                 if (seq.getObjectAt(k) instanceof ASN1TaggedObject) {
                     ASN1TaggedObject tag = (ASN1TaggedObject) seq.getObjectAt(k);
-                    if (tag.getObject() instanceof ASN1Sequence) {
-                        seq = (ASN1Sequence) tag.getObject();
+                    if (tag.getBaseObject().toASN1Primitive() instanceof ASN1Sequence) {
+                        seq = (ASN1Sequence) tag.getBaseObject().toASN1Primitive();
                         ret = false;
                         break;
                     } else
diff --git a/sign/src/test/java/com/itextpdf/signatures/testutils/SignaturesCompareTool.java b/sign/src/test/java/com/itextpdf/signatures/testutils/SignaturesCompareTool.java
@@ -101,8 +101,8 @@ public static String compareSignatures(String dest, String cmp) throws IOExcepti
                     isFailed = true;
                 }
 
-                ASN1Sequence outContent = (ASN1Sequence) ((ASN1TaggedObject) outSignedData.getObjectAt(1)).getObject();
-                ASN1Sequence cmpContent = (ASN1Sequence) ((ASN1TaggedObject) cmpSignedData.getObjectAt(1)).getObject();
+                ASN1Sequence outContent = (ASN1Sequence) ((ASN1TaggedObject) outSignedData.getObjectAt(1)).getBaseObject().toASN1Primitive();
+                ASN1Sequence cmpContent = (ASN1Sequence) ((ASN1TaggedObject) cmpSignedData.getObjectAt(1)).getBaseObject().toASN1Primitive();
                 if (outContent.size() != cmpContent.size()) {
                     addError(errorText, "Signatures base elements counts are different",
                             String.valueOf(outContent.size()),
@@ -221,8 +221,8 @@ private static boolean compareAsn1Structures(ASN1Primitive out, ASN1Primitive cm
             if (cmp instanceof ASN1TaggedObject) {
                 ASN1TaggedObject cmpTag = (ASN1TaggedObject) cmp;
                 ASN1TaggedObject outTag = (ASN1TaggedObject) out;
-                if (!(cmpTag.getObject() instanceof ASN1Sequence)) {
-                    if (!cmpTag.getObject().equals(outTag.getObject())) {
+                if (!(cmpTag.getBaseObject().toASN1Primitive() instanceof ASN1Sequence)) {
+                    if (!cmpTag.getBaseObject().toASN1Primitive().equals(outTag.getBaseObject().toASN1Primitive())) {
                         addError(errorText, "ASN1 objects are different", ASN1Dump.dumpAsString(outTag, true),
                                 ASN1Dump.dumpAsString(cmpTag, true));
                         isFailed = true;
@@ -231,8 +231,8 @@ private static boolean compareAsn1Structures(ASN1Primitive out, ASN1Primitive cm
                     return isFailed;
                 }
 
-                cmpObject = (ASN1Sequence) (cmpTag).getObject();
-                outObject = (ASN1Sequence) (outTag).getObject();
+                cmpObject = (ASN1Sequence) (cmpTag).getBaseObject().toASN1Primitive();
+                outObject = (ASN1Sequence) (outTag).getBaseObject().toASN1Primitive();
             } else {
                 cmpObject = (ASN1Sequence) cmp;
                 outObject = (ASN1Sequence) out;

Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ public static String getCRLURL(X509Certificate certificate) throws CertificatePa`
`119`	`119`	`if (name.getTagNo() != GeneralName.uniformResourceIdentifier) {`
`120`	`120`	`continue;`
`121`	`121`	`}`
`122`		`- DERIA5String derStr = DERIA5String.getInstance((ASN1TaggedObject)name.toASN1Primitive(), false);`
	`122`	`+ DERIA5String derStr = (DERIA5String)DERIA5String.getInstance((ASN1TaggedObject)name.toASN1Primitive(), false);`
`123`	`123`	`return derStr.getString();`
`124`	`124`	`}`
`125`	`125`	`}`