Update java bc library to 1.75

vitali-pr · Dmitry Radchuk · commit 06bc007eb1e7 · 2023-11-20T03:26:18.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
@@ -72,7 +72,7 @@
 
   <properties>
     <argLine>-Xmx1024m</argLine>
-    <bouncycastle.version>1.70</bouncycastle.version>
+    <bouncycastle.version>1.75</bouncycastle.version>
     <dependencyCheck.version>7.0.0</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
@@ -116,7 +116,7 @@ public static String getCRLURL(X509Certificate certificate) {
                 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
@@ -276,7 +276,7 @@ public PdfPKCS7(byte[] contentsKey, PdfName filterSubtype, String provider) {
             if (!objId.getId().equals(SecurityIDs.ID_PKCS7_SIGNED_DATA))
                 throw new IllegalArgumentException(
                         SignExceptionMessageConstant.NOT_A_VALID_PKCS7_OBJECT_NOT_SIGNED_DATA);
-            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
@@ -300,7 +300,7 @@ public PdfPKCS7(byte[] contentsKey, PdfName filterSubtype, String provider) {
             ASN1Sequence rsaData = (ASN1Sequence) content.getObjectAt(2);
             if (rsaData.size() > 1) {
                 ASN1OctetString rsaDataContent =
-                        (ASN1OctetString) ((ASN1TaggedObject) rsaData.getObjectAt(1)).getObject();
+                        (ASN1OctetString) ((ASN1TaggedObject) rsaData.getObjectAt(1)).getBaseObject().toASN1Primitive();
                 this.rsaData = rsaDataContent.getOctets();
             }
 
@@ -400,11 +400,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);
                             }
                         }
@@ -1397,8 +1397,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
@@ -268,8 +268,8 @@ private static boolean compareSignedData(ASN1Sequence outSignedData, ASN1Sequenc
             return false;
         }
 
-        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()),
@@ -359,7 +359,7 @@ private static boolean compareAsn1Structures(ASN1Primitive out, ASN1Primitive cm
 
         if (cmp instanceof ASN1TaggedObject) {
             return compareAsn1Structures(
-                    ((ASN1TaggedObject) out).getObject(), ((ASN1TaggedObject) cmp).getObject(), errorText);
+                    ((ASN1TaggedObject) out).getBaseObject().toASN1Primitive(), ((ASN1TaggedObject) cmp).getBaseObject().toASN1Primitive(), errorText);
         } else if (cmp instanceof ASN1Sequence) {
             if (!compareContainers(((ASN1Sequence) out).toArray(), ((ASN1Sequence) cmp).toArray(), errorText)) {
                 addError(errorText, "ASN1Sequence objects are different");
@@ -464,17 +464,17 @@ private static boolean compareRevocationInfoArchivalAttribute(ASN1Encodable[] ou
                 return false;
             }
 
-            if (!(outTaggedObject.getObject() instanceof ASN1Sequence)
-                    || !(cmpTaggedObject.getObject() instanceof ASN1Sequence)) {
+            if (!(outTaggedObject.getBaseObject().toASN1Primitive() instanceof ASN1Sequence)
+                    || !(cmpTaggedObject.getBaseObject().toASN1Primitive() instanceof ASN1Sequence)) {
                 addError(errorText, structureIsInvalidError,
                         String.join("", Arrays.stream(out).map(e -> ASN1Dump.dumpAsString(e)).collect(Collectors.toList())),
                         String.join("", Arrays.stream(cmp).map(e -> ASN1Dump.dumpAsString(e)).collect(Collectors.toList())));
                 return false;
             }
 
             // revocation entries can be either CRLs or OCSPs in most cases
-            ASN1Sequence outRevocationEntries = (ASN1Sequence) outTaggedObject.getObject();
-            ASN1Sequence cmpRevocationEntries = (ASN1Sequence) cmpTaggedObject.getObject();
+            ASN1Sequence outRevocationEntries = (ASN1Sequence) outTaggedObject.getBaseObject().toASN1Primitive();
+            ASN1Sequence cmpRevocationEntries = (ASN1Sequence) cmpTaggedObject.getBaseObject().toASN1Primitive();
             if (outRevocationEntries.size() != cmpRevocationEntries.size()) {
                 addError(errorText,
                         "Signature revocation info archival attributes have different number of entries",

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