From commits-return-13401-archive-asf-public=cust-asf.ponee.io@pdfbox.apache.org Tue Oct 23 19:12:22 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 50CAF18066B for ; Tue, 23 Oct 2018 19:12:22 +0200 (CEST) Received: (qmail 24623 invoked by uid 500); 23 Oct 2018 17:12:21 -0000 Mailing-List: contact commits-help@pdfbox.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@pdfbox.apache.org Delivered-To: mailing list commits@pdfbox.apache.org Received: (qmail 24614 invoked by uid 99); 23 Oct 2018 17:12:21 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 23 Oct 2018 17:12:21 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id E45C73A018B for ; Tue, 23 Oct 2018 17:12:20 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1844682 - /pdfbox/branches/2.0/examples/src/main/java/org/apache/pdfbox/examples/signature/validation/CertInformationCollector.java Date: Tue, 23 Oct 2018 17:12:20 -0000 To: commits@pdfbox.apache.org From: tilman@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20181023171220.E45C73A018B@svn01-us-west.apache.org> Author: tilman Date: Tue Oct 23 17:12:20 2018 New Revision: 1844682 URL: http://svn.apache.org/viewvc?rev=1844682&view=rev Log: PDFBOX-3017: use constants from BC Modified: pdfbox/branches/2.0/examples/src/main/java/org/apache/pdfbox/examples/signature/validation/CertInformationCollector.java Modified: pdfbox/branches/2.0/examples/src/main/java/org/apache/pdfbox/examples/signature/validation/CertInformationCollector.java URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/examples/src/main/java/org/apache/pdfbox/examples/signature/validation/CertInformationCollector.java?rev=1844682&r1=1844681&r2=1844682&view=diff ============================================================================== --- pdfbox/branches/2.0/examples/src/main/java/org/apache/pdfbox/examples/signature/validation/CertInformationCollector.java (original) +++ pdfbox/branches/2.0/examples/src/main/java/org/apache/pdfbox/examples/signature/validation/CertInformationCollector.java Tue Oct 23 17:12:20 2018 @@ -43,6 +43,7 @@ import org.bouncycastle.asn1.DERSet; import org.bouncycastle.asn1.cms.Attribute; import org.bouncycastle.asn1.cms.AttributeTable; import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers; +import org.bouncycastle.asn1.x509.Extension; import org.bouncycastle.cert.X509CertificateHolder; import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter; import org.bouncycastle.cms.CMSException; @@ -65,14 +66,6 @@ public class CertInformationCollector { private static final Log LOG = LogFactory.getLog(CertInformationCollector.class); - // As described in https://tools.ietf.org/html/rfc3280.html#section-4.2.2.1 - private static final String ID_PE_AUTHORITYINFOACCESS = "1.3.6.1.5.5.7.1.1"; - - // As described in https://tools.ietf.org/html/rfc3280.html#section-4.2.1.14 - // Disable false Sonar warning for "Hardcoded IP Address ..." - @SuppressWarnings("squid:S1313") - private static final String ID_CE_CRLDISTRIBUTIONPOINTS = "2.5.29.31"; - private static final int MAX_CERTIFICATE_CHAIN_DEPTH = 5; private final Map certificateStore = new HashMap(); @@ -269,7 +262,8 @@ public class CertInformationCollector certInfo.certificate = certificate; // Certificate Authority Information Access - byte[] authorityExtensionValue = certificate.getExtensionValue(ID_PE_AUTHORITYINFOACCESS); + // As described in https://tools.ietf.org/html/rfc3280.html#section-4.2.2.1 + byte[] authorityExtensionValue = certificate.getExtensionValue(Extension.authorityInfoAccess.getId()); if (authorityExtensionValue != null) { CertInformationHelper.getAuthorityInfoExtensionValue(authorityExtensionValue, certInfo); @@ -280,7 +274,8 @@ public class CertInformationCollector getAlternativeIssuerCertificate(certInfo, maxDepth); } - byte[] crlExtensionValue = certificate.getExtensionValue(ID_CE_CRLDISTRIBUTIONPOINTS); + // As described in https://tools.ietf.org/html/rfc3280.html#section-4.2.1.14 + byte[] crlExtensionValue = certificate.getExtensionValue(Extension.cRLDistributionPoints.getId()); if (crlExtensionValue != null) { certInfo.crlUrl = CertInformationHelper.getCrlUrlFromExtensionValue(crlExtensionValue);