Skip to content

Commit 06bc007

Browse files
vitali-prDmitry Radchuk
vitali-pr
authored and
Dmitry Radchuk
committed
Update java bc library to 1.75
DEVSIX-7663
1 parent deb658a commit 06bc007

File tree

7 files changed

+21
-21
lines changed

7 files changed

+21
-21
lines changed

‎forms/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,14 @@
3434
</dependency>
3535
<dependency>
3636
<groupId>org.bouncycastle</groupId>
37-
<artifactId>bcpkix-jdk15on</artifactId>
37+
<artifactId>bcpkix-jdk18on</artifactId>
3838
<version>${bouncycastle.version}</version>
3939
<scope>test</scope>
4040
<optional>true</optional>
4141
</dependency>
4242
<dependency>
4343
<groupId>org.bouncycastle</groupId>
44-
<artifactId>bcprov-jdk15on</artifactId>
44+
<artifactId>bcprov-jdk18on</artifactId>
4545
<version>${bouncycastle.version}</version>
4646
<scope>test</scope>
4747
<optional>true</optional>

‎kernel/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@
2020
</dependency>
2121
<dependency>
2222
<groupId>org.bouncycastle</groupId>
23-
<artifactId>bcpkix-jdk15on</artifactId>
23+
<artifactId>bcpkix-jdk18on</artifactId>
2424
<version>${bouncycastle.version}</version>
2525
</dependency>
2626
<dependency>
2727
<groupId>org.bouncycastle</groupId>
28-
<artifactId>bcprov-jdk15on</artifactId>
28+
<artifactId>bcprov-jdk18on</artifactId>
2929
<version>${bouncycastle.version}</version>
3030
</dependency>
3131
<dependency>

‎pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272

7373
<properties>
7474
<argLine>-Xmx1024m</argLine>
75-
<bouncycastle.version>1.70</bouncycastle.version>
75+
<bouncycastle.version>1.75</bouncycastle.version>
7676
<dependencyCheck.version>7.0.0</dependencyCheck.version>
7777
<failsafe.version>3.0.0-M3</failsafe.version>
7878
<integrationtests>com.itextpdf.test.annotations.type.IntegrationTest</integrationtests>

‎sign/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@
3232
</dependency>
3333
<dependency>
3434
<groupId>org.bouncycastle</groupId>
35-
<artifactId>bcpkix-jdk15on</artifactId>
35+
<artifactId>bcpkix-jdk18on</artifactId>
3636
<version>${bouncycastle.version}</version>
3737
<optional>true</optional>
3838
</dependency>
3939
<dependency>
4040
<groupId>org.bouncycastle</groupId>
41-
<artifactId>bcprov-jdk15on</artifactId>
41+
<artifactId>bcprov-jdk18on</artifactId>
4242
<version>${bouncycastle.version}</version>
4343
<optional>true</optional>
4444
</dependency>

‎sign/src/main/java/com/itextpdf/signatures/CertificateUtil.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ public static String getCRLURL(X509Certificate certificate) {
116116
if (name.getTagNo() != GeneralName.uniformResourceIdentifier) {
117117
continue;
118118
}
119-
DERIA5String derStr = DERIA5String.getInstance((ASN1TaggedObject)name.toASN1Primitive(), false);
119+
DERIA5String derStr = (DERIA5String)DERIA5String.getInstance((ASN1TaggedObject)name.toASN1Primitive(), false);
120120
return derStr.getString();
121121
}
122122
}

‎sign/src/main/java/com/itextpdf/signatures/PdfPKCS7.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ public PdfPKCS7(byte[] contentsKey, PdfName filterSubtype, String provider) {
276276
if (!objId.getId().equals(SecurityIDs.ID_PKCS7_SIGNED_DATA))
277277
throw new IllegalArgumentException(
278278
SignExceptionMessageConstant.NOT_A_VALID_PKCS7_OBJECT_NOT_SIGNED_DATA);
279-
ASN1Sequence content = (ASN1Sequence) ((ASN1TaggedObject) signedData.getObjectAt(1)).getObject();
279+
ASN1Sequence content = (ASN1Sequence) ((ASN1TaggedObject) signedData.getObjectAt(1)).getBaseObject().toASN1Primitive();
280280
// the positions that we care are:
281281
// 0 - version
282282
// 1 - digestAlgorithms
@@ -300,7 +300,7 @@ public PdfPKCS7(byte[] contentsKey, PdfName filterSubtype, String provider) {
300300
ASN1Sequence rsaData = (ASN1Sequence) content.getObjectAt(2);
301301
if (rsaData.size() > 1) {
302302
ASN1OctetString rsaDataContent =
303-
(ASN1OctetString) ((ASN1TaggedObject) rsaData.getObjectAt(1)).getObject();
303+
(ASN1OctetString) ((ASN1TaggedObject) rsaData.getObjectAt(1)).getBaseObject().toASN1Primitive();
304304
this.rsaData = rsaDataContent.getOctets();
305305
}
306306

@@ -400,11 +400,11 @@ public PdfPKCS7(byte[] contentsKey, PdfName filterSubtype, String provider) {
400400
for (int j = 0; j < seqout.size(); ++j) {
401401
ASN1TaggedObject tg = (ASN1TaggedObject) seqout.getObjectAt(j);
402402
if (tg.getTagNo() == 0) {
403-
ASN1Sequence seqin = (ASN1Sequence) tg.getObject();
403+
ASN1Sequence seqin = (ASN1Sequence) tg.getBaseObject().toASN1Primitive();
404404
findCRL(seqin);
405405
}
406406
if (tg.getTagNo() == 1) {
407-
ASN1Sequence seqin = (ASN1Sequence) tg.getObject();
407+
ASN1Sequence seqin = (ASN1Sequence) tg.getBaseObject().toASN1Primitive();
408408
findOcsp(seqin);
409409
}
410410
}
@@ -1397,8 +1397,8 @@ private void findOcsp(ASN1Sequence seq) throws IOException {
13971397
}
13981398
if (seq.getObjectAt(k) instanceof ASN1TaggedObject) {
13991399
ASN1TaggedObject tag = (ASN1TaggedObject) seq.getObjectAt(k);
1400-
if (tag.getObject() instanceof ASN1Sequence) {
1401-
seq = (ASN1Sequence) tag.getObject();
1400+
if (tag.getBaseObject().toASN1Primitive() instanceof ASN1Sequence) {
1401+
seq = (ASN1Sequence) tag.getBaseObject().toASN1Primitive();
14021402
ret = false;
14031403
break;
14041404
} else {

‎sign/src/test/java/com/itextpdf/signatures/testutils/SignaturesCompareTool.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -268,8 +268,8 @@ private static boolean compareSignedData(ASN1Sequence outSignedData, ASN1Sequenc
268268
return false;
269269
}
270270

271-
ASN1Sequence outContent = (ASN1Sequence) ((ASN1TaggedObject) outSignedData.getObjectAt(1)).getObject();
272-
ASN1Sequence cmpContent = (ASN1Sequence) ((ASN1TaggedObject) cmpSignedData.getObjectAt(1)).getObject();
271+
ASN1Sequence outContent = (ASN1Sequence) ((ASN1TaggedObject) outSignedData.getObjectAt(1)).getBaseObject().toASN1Primitive();
272+
ASN1Sequence cmpContent = (ASN1Sequence) ((ASN1TaggedObject) cmpSignedData.getObjectAt(1)).getBaseObject().toASN1Primitive();
273273
if (outContent.size() != cmpContent.size()) {
274274
addError(errorText, "Signatures base elements counts are different",
275275
String.valueOf(outContent.size()),
@@ -359,7 +359,7 @@ private static boolean compareAsn1Structures(ASN1Primitive out, ASN1Primitive cm
359359

360360
if (cmp instanceof ASN1TaggedObject) {
361361
return compareAsn1Structures(
362-
((ASN1TaggedObject) out).getObject(), ((ASN1TaggedObject) cmp).getObject(), errorText);
362+
((ASN1TaggedObject) out).getBaseObject().toASN1Primitive(), ((ASN1TaggedObject) cmp).getBaseObject().toASN1Primitive(), errorText);
363363
} else if (cmp instanceof ASN1Sequence) {
364364
if (!compareContainers(((ASN1Sequence) out).toArray(), ((ASN1Sequence) cmp).toArray(), errorText)) {
365365
addError(errorText, "ASN1Sequence objects are different");
@@ -464,17 +464,17 @@ private static boolean compareRevocationInfoArchivalAttribute(ASN1Encodable[] ou
464464
return false;
465465
}
466466

467-
if (!(outTaggedObject.getObject() instanceof ASN1Sequence)
468-
|| !(cmpTaggedObject.getObject() instanceof ASN1Sequence)) {
467+
if (!(outTaggedObject.getBaseObject().toASN1Primitive() instanceof ASN1Sequence)
468+
|| !(cmpTaggedObject.getBaseObject().toASN1Primitive() instanceof ASN1Sequence)) {
469469
addError(errorText, structureIsInvalidError,
470470
String.join("", Arrays.stream(out).map(e -> ASN1Dump.dumpAsString(e)).collect(Collectors.toList())),
471471
String.join("", Arrays.stream(cmp).map(e -> ASN1Dump.dumpAsString(e)).collect(Collectors.toList())));
472472
return false;
473473
}
474474

475475
// revocation entries can be either CRLs or OCSPs in most cases
476-
ASN1Sequence outRevocationEntries = (ASN1Sequence) outTaggedObject.getObject();
477-
ASN1Sequence cmpRevocationEntries = (ASN1Sequence) cmpTaggedObject.getObject();
476+
ASN1Sequence outRevocationEntries = (ASN1Sequence) outTaggedObject.getBaseObject().toASN1Primitive();
477+
ASN1Sequence cmpRevocationEntries = (ASN1Sequence) cmpTaggedObject.getBaseObject().toASN1Primitive();
478478
if (outRevocationEntries.size() != cmpRevocationEntries.size()) {
479479
addError(errorText,
480480
"Signature revocation info archival attributes have different number of entries",

0 commit comments

Comments
 (0)