forked from pool/itextpdf
67 lines
4.1 KiB
Diff
67 lines
4.1 KiB
Diff
diff -urEbwB itextpdf-5.5.13.3.orig/itext/src/main/java/com/itextpdf/text/pdf/security/CertificateUtil.java itextpdf-5.5.13.3/itext/src/main/java/com/itextpdf/text/pdf/security/CertificateUtil.java
|
|
--- itextpdf-5.5.13.3.orig/itext/src/main/java/com/itextpdf/text/pdf/security/CertificateUtil.java 2023-10-19 07:30:20.110847202 +0200
|
|
+++ itextpdf-5.5.13.3/itext/src/main/java/com/itextpdf/text/pdf/security/CertificateUtil.java 2023-10-19 08:45:30.096597300 +0200
|
|
@@ -60,6 +60,7 @@
|
|
import org.bouncycastle.asn1.ASN1Primitive;
|
|
import org.bouncycastle.asn1.ASN1Sequence;
|
|
import org.bouncycastle.asn1.ASN1TaggedObject;
|
|
+import org.bouncycastle.asn1.ASN1IA5String;
|
|
import org.bouncycastle.asn1.DERIA5String;
|
|
import org.bouncycastle.asn1.DEROctetString;
|
|
import org.bouncycastle.asn1.x509.CRLDistPoint;
|
|
@@ -120,7 +121,7 @@
|
|
if (name.getTagNo() != GeneralName.uniformResourceIdentifier) {
|
|
continue;
|
|
}
|
|
- DERIA5String derStr = DERIA5String.getInstance((ASN1TaggedObject)name.toASN1Primitive(), false);
|
|
+ ASN1IA5String derStr = ASN1IA5String.getInstance((ASN1TaggedObject)name.toASN1Primitive(), false);
|
|
return derStr.getString();
|
|
}
|
|
}
|
|
diff -urEbwB itextpdf-5.5.13.3.orig/itext/src/main/java/com/itextpdf/text/pdf/security/PdfPKCS7.java itextpdf-5.5.13.3/itext/src/main/java/com/itextpdf/text/pdf/security/PdfPKCS7.java
|
|
--- itextpdf-5.5.13.3.orig/itext/src/main/java/com/itextpdf/text/pdf/security/PdfPKCS7.java 2023-10-19 07:30:20.110847202 +0200
|
|
+++ itextpdf-5.5.13.3/itext/src/main/java/com/itextpdf/text/pdf/security/PdfPKCS7.java 2023-10-19 07:34:27.325343663 +0200
|
|
@@ -220,7 +220,7 @@
|
|
ASN1ObjectIdentifier objId = (ASN1ObjectIdentifier)signedData.getObjectAt(0);
|
|
if (!objId.getId().equals(SecurityIDs.ID_PKCS7_SIGNED_DATA))
|
|
throw new IllegalArgumentException(MessageLocalization.getComposedMessage("not.a.valid.pkcs.7.object.not.signed.data"));
|
|
- ASN1Sequence content = (ASN1Sequence)((ASN1TaggedObject)signedData.getObjectAt(1)).getObject();
|
|
+ ASN1Sequence content = (ASN1Sequence)((ASN1TaggedObject)signedData.getObjectAt(1)).getBaseObject();
|
|
// the positions that we care are:
|
|
// 0 - version
|
|
// 1 - digestAlgorithms
|
|
@@ -243,7 +243,7 @@
|
|
// 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();
|
|
RSAdata = rsaDataContent.getOctets();
|
|
}
|
|
|
|
@@ -343,11 +343,11 @@
|
|
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();
|
|
findCRL(seqin);
|
|
}
|
|
if (tg.getTagNo() == 1) {
|
|
- ASN1Sequence seqin = (ASN1Sequence)tg.getObject();
|
|
+ ASN1Sequence seqin = (ASN1Sequence)tg.getBaseObject();
|
|
findOcsp(seqin);
|
|
}
|
|
}
|
|
@@ -1283,8 +1283,8 @@
|
|
}
|
|
if (seq.getObjectAt(k) instanceof ASN1TaggedObject) {
|
|
ASN1TaggedObject tag = (ASN1TaggedObject)seq.getObjectAt(k);
|
|
- if (tag.getObject() instanceof ASN1Sequence) {
|
|
- seq = (ASN1Sequence)tag.getObject();
|
|
+ if (tag.getBaseObject() instanceof ASN1Sequence) {
|
|
+ seq = (ASN1Sequence)tag.getBaseObject();
|
|
ret = false;
|
|
break;
|
|
}
|