You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ti...@apache.org on 2019/10/07 18:40:54 UTC
svn commit: r1868093 - in
/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature:
cert/CertificateVerifier.java validation/CertInformationHelper.java
Author: tilman
Date: Mon Oct 7 18:40:54 2019
New Revision: 1868093
URL: http://svn.apache.org/viewvc?rev=1868093&view=rev
Log:
PDFBOX-3017: use constant.equals; use base class
Modified:
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/cert/CertificateVerifier.java
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/validation/CertInformationHelper.java
Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/cert/CertificateVerifier.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/cert/CertificateVerifier.java?rev=1868093&r1=1868092&r2=1868093&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/cert/CertificateVerifier.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/cert/CertificateVerifier.java Mon Oct 7 18:40:54 2019
@@ -49,6 +49,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.pdfbox.io.IOUtils;
import org.apache.pdfbox.pdmodel.encryption.SecurityProvider;
+import org.bouncycastle.asn1.ASN1Encodable;
import org.bouncycastle.asn1.ASN1ObjectIdentifier;
import org.bouncycastle.asn1.ASN1OctetString;
import org.bouncycastle.asn1.ASN1Primitive;
@@ -285,8 +286,8 @@ public final class CertificateVerifier
{
// AccessDescription
ASN1Sequence obj = (ASN1Sequence) objects.nextElement();
- ASN1ObjectIdentifier oid = (ASN1ObjectIdentifier) obj.getObjectAt(0);
- if (!oid.equals(X509ObjectIdentifiers.id_ad_caIssuers))
+ ASN1Encodable oid = obj.getObjectAt(0);
+ if (!X509ObjectIdentifiers.id_ad_caIssuers.equals(oid))
{
continue;
}
@@ -395,7 +396,7 @@ public final class CertificateVerifier
ASN1ObjectIdentifier oid = (ASN1ObjectIdentifier) obj.getObjectAt(0);
// accessLocation
ASN1TaggedObject location = (ASN1TaggedObject) obj.getObjectAt(1);
- if (oid.equals(X509ObjectIdentifiers.id_ad_ocsp)
+ if (X509ObjectIdentifiers.id_ad_ocsp.equals(oid)
&& location.getTagNo() == GeneralName.uniformResourceIdentifier)
{
ASN1OctetString url = (ASN1OctetString) location.getObject();
Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/validation/CertInformationHelper.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/validation/CertInformationHelper.java?rev=1868093&r1=1868092&r2=1868093&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/validation/CertInformationHelper.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/validation/CertInformationHelper.java Mon Oct 7 18:40:54 2019
@@ -25,7 +25,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.pdfbox.examples.signature.validation.CertInformationCollector.CertSignatureInformation;
import org.apache.pdfbox.util.Hex;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
+import org.bouncycastle.asn1.ASN1Encodable;
import org.bouncycastle.asn1.ASN1OctetString;
import org.bouncycastle.asn1.ASN1Sequence;
import org.bouncycastle.asn1.ASN1TaggedObject;
@@ -79,17 +79,17 @@ public class CertInformationHelper
{
// AccessDescription
ASN1Sequence obj = (ASN1Sequence) objects.nextElement();
- ASN1ObjectIdentifier oid = (ASN1ObjectIdentifier) obj.getObjectAt(0);
+ ASN1Encodable oid = obj.getObjectAt(0);
// accessLocation
ASN1TaggedObject location = (ASN1TaggedObject) obj.getObjectAt(1);
- if (oid.equals(X509ObjectIdentifiers.id_ad_ocsp)
+ if (X509ObjectIdentifiers.id_ad_ocsp.equals(oid)
&& location.getTagNo() == GeneralName.uniformResourceIdentifier)
{
ASN1OctetString url = (ASN1OctetString) location.getObject();
certInfo.setOcspUrl(new String(url.getOctets()));
}
- else if (oid.equals(X509ObjectIdentifiers.id_ad_caIssuers))
+ else if (X509ObjectIdentifiers.id_ad_caIssuers.equals(oid))
{
ASN1OctetString uri = (ASN1OctetString) location.getObject();
certInfo.setIssuerUrl(new String(uri.getOctets()));