Skip to content

Commit 5e7aad1

Browse files
vitali-prDmitry Radchuk
vitali-pr
authored and
Dmitry Radchuk
committed
Update java bc library to 1.75
DEVSIX-7663
1 parent 15eba0e commit 5e7aad1

File tree

7 files changed

+22
-22
lines changed

7 files changed

+22
-22
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
@@ -71,7 +71,7 @@
7171

7272
<properties>
7373
<argLine>-Xmx1024m</argLine>
74-
<bouncycastle.version>1.68</bouncycastle.version>
74+
<bouncycastle.version>1.75</bouncycastle.version>
7575
<dependencyCheck.version>6.0.3</dependencyCheck.version>
7676
<failsafe.version>3.0.0-M3</failsafe.version>
7777
<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
@@ -119,7 +119,7 @@ public static String getCRLURL(X509Certificate certificate) throws CertificatePa
119119
if (name.getTagNo() != GeneralName.uniformResourceIdentifier) {
120120
continue;
121121
}
122-
DERIA5String derStr = DERIA5String.getInstance((ASN1TaggedObject)name.toASN1Primitive(), false);
122+
DERIA5String derStr = (DERIA5String)DERIA5String.getInstance((ASN1TaggedObject)name.toASN1Primitive(), false);
123123
return derStr.getString();
124124
}
125125
}

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ public PdfPKCS7(byte[] contentsKey, PdfName filterSubtype, String provider) {
270270
ASN1ObjectIdentifier objId = (ASN1ObjectIdentifier) signedData.getObjectAt(0);
271271
if (!objId.getId().equals(SecurityIDs.ID_PKCS7_SIGNED_DATA))
272272
throw new IllegalArgumentException(PdfException.NotAValidPkcs7ObjectNotSignedData);
273-
ASN1Sequence content = (ASN1Sequence) ((ASN1TaggedObject) signedData.getObjectAt(1)).getObject();
273+
ASN1Sequence content = (ASN1Sequence) ((ASN1TaggedObject) signedData.getObjectAt(1)).getBaseObject().toASN1Primitive();
274274
// the positions that we care are:
275275
// 0 - version
276276
// 1 - digestAlgorithms
@@ -293,7 +293,7 @@ public PdfPKCS7(byte[] contentsKey, PdfName filterSubtype, String provider) {
293293
// the possible ID_PKCS7_DATA
294294
ASN1Sequence rsaData = (ASN1Sequence) content.getObjectAt(2);
295295
if (rsaData.size() > 1) {
296-
ASN1OctetString rsaDataContent = (ASN1OctetString) ((ASN1TaggedObject) rsaData.getObjectAt(1)).getObject();
296+
ASN1OctetString rsaDataContent = (ASN1OctetString) ((ASN1TaggedObject) rsaData.getObjectAt(1)).getBaseObject().toASN1Primitive();
297297
this.rsaData = rsaDataContent.getOctets();
298298
}
299299

@@ -390,11 +390,11 @@ public PdfPKCS7(byte[] contentsKey, PdfName filterSubtype, String provider) {
390390
for (int j = 0; j < seqout.size(); ++j) {
391391
ASN1TaggedObject tg = (ASN1TaggedObject) seqout.getObjectAt(j);
392392
if (tg.getTagNo() == 0) {
393-
ASN1Sequence seqin = (ASN1Sequence) tg.getObject();
393+
ASN1Sequence seqin = (ASN1Sequence) tg.getBaseObject().toASN1Primitive();
394394
findCRL(seqin);
395395
}
396396
if (tg.getTagNo() == 1) {
397-
ASN1Sequence seqin = (ASN1Sequence) tg.getObject();
397+
ASN1Sequence seqin = (ASN1Sequence) tg.getBaseObject().toASN1Primitive();
398398
findOcsp(seqin);
399399
}
400400
}
@@ -761,7 +761,7 @@ public byte[] getEncodedPKCS1() {
761761
digest = sig.sign();
762762
ByteArrayOutputStream bOut = new ByteArrayOutputStream();
763763

764-
ASN1OutputStream dout = new ASN1OutputStream(bOut);
764+
ASN1OutputStream dout = ASN1OutputStream.create(bOut);
765765
dout.writeObject(new DEROctetString(digest));
766766
dout.close();
767767

@@ -947,7 +947,7 @@ public byte[] getEncodedPKCS7(byte[] secondDigest, PdfSigner.CryptoStandard sigt
947947

948948
ByteArrayOutputStream bOut = new ByteArrayOutputStream();
949949

950-
ASN1OutputStream dout = new ASN1OutputStream(bOut);
950+
ASN1OutputStream dout = ASN1OutputStream.create(bOut);
951951
dout.writeObject(new DERSequence(whole));
952952
dout.close();
953953

@@ -1457,8 +1457,8 @@ private void findOcsp(ASN1Sequence seq) throws IOException {
14571457
}
14581458
if (seq.getObjectAt(k) instanceof ASN1TaggedObject) {
14591459
ASN1TaggedObject tag = (ASN1TaggedObject) seq.getObjectAt(k);
1460-
if (tag.getObject() instanceof ASN1Sequence) {
1461-
seq = (ASN1Sequence) tag.getObject();
1460+
if (tag.getBaseObject().toASN1Primitive() instanceof ASN1Sequence) {
1461+
seq = (ASN1Sequence) tag.getBaseObject().toASN1Primitive();
14621462
ret = false;
14631463
break;
14641464
} else

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,8 @@ public static String compareSignatures(String dest, String cmp) throws IOExcepti
101101
isFailed = true;
102102
}
103103

104-
ASN1Sequence outContent = (ASN1Sequence) ((ASN1TaggedObject) outSignedData.getObjectAt(1)).getObject();
105-
ASN1Sequence cmpContent = (ASN1Sequence) ((ASN1TaggedObject) cmpSignedData.getObjectAt(1)).getObject();
104+
ASN1Sequence outContent = (ASN1Sequence) ((ASN1TaggedObject) outSignedData.getObjectAt(1)).getBaseObject().toASN1Primitive();
105+
ASN1Sequence cmpContent = (ASN1Sequence) ((ASN1TaggedObject) cmpSignedData.getObjectAt(1)).getBaseObject().toASN1Primitive();
106106
if (outContent.size() != cmpContent.size()) {
107107
addError(errorText, "Signatures base elements counts are different",
108108
String.valueOf(outContent.size()),
@@ -221,8 +221,8 @@ private static boolean compareAsn1Structures(ASN1Primitive out, ASN1Primitive cm
221221
if (cmp instanceof ASN1TaggedObject) {
222222
ASN1TaggedObject cmpTag = (ASN1TaggedObject) cmp;
223223
ASN1TaggedObject outTag = (ASN1TaggedObject) out;
224-
if (!(cmpTag.getObject() instanceof ASN1Sequence)) {
225-
if (!cmpTag.getObject().equals(outTag.getObject())) {
224+
if (!(cmpTag.getBaseObject().toASN1Primitive() instanceof ASN1Sequence)) {
225+
if (!cmpTag.getBaseObject().toASN1Primitive().equals(outTag.getBaseObject().toASN1Primitive())) {
226226
addError(errorText, "ASN1 objects are different", ASN1Dump.dumpAsString(outTag, true),
227227
ASN1Dump.dumpAsString(cmpTag, true));
228228
isFailed = true;
@@ -231,8 +231,8 @@ private static boolean compareAsn1Structures(ASN1Primitive out, ASN1Primitive cm
231231
return isFailed;
232232
}
233233

234-
cmpObject = (ASN1Sequence) (cmpTag).getObject();
235-
outObject = (ASN1Sequence) (outTag).getObject();
234+
cmpObject = (ASN1Sequence) (cmpTag).getBaseObject().toASN1Primitive();
235+
outObject = (ASN1Sequence) (outTag).getBaseObject().toASN1Primitive();
236236
} else {
237237
cmpObject = (ASN1Sequence) cmp;
238238
outObject = (ASN1Sequence) out;

0 commit comments

Comments
 (0)