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 2022/03/08 16:30:36 UTC
svn commit: r1898738 - in /pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature: cert/CRLVerifier.java cert/CertificateVerifier.java validation/CertInformationCollector.java
Author: tilman
Date: Tue Mar 8 16:30:36 2022
New Revision: 1898738
URL: http://svn.apache.org/viewvc?rev=1898738&view=rev
Log:
PDFBOX-5385: use the new method
Modified:
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/cert/CRLVerifier.java
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/CertInformationCollector.java
Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/cert/CRLVerifier.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/cert/CRLVerifier.java?rev=1898738&r1=1898737&r2=1898738&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/cert/CRLVerifier.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/cert/CRLVerifier.java Tue Mar 8 16:30:36 2022
@@ -22,7 +22,6 @@ package org.apache.pdfbox.examples.signa
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.net.URL;
import java.security.GeneralSecurityException;
import java.security.cert.CRLException;
import java.security.cert.CertificateException;
@@ -46,6 +45,7 @@ import javax.naming.directory.InitialDir
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.pdfbox.examples.signature.SigUtils;
import org.apache.pdfbox.pdmodel.encryption.SecurityProvider;
@@ -293,7 +293,7 @@ public final class CRLVerifier
public static X509CRL downloadCRLFromWeb(String crlURL)
throws IOException, CertificateException, CRLException
{
- try (InputStream crlStream = new URL(crlURL).openStream())
+ try (InputStream crlStream = SigUtils.openURL(crlURL))
{
return (X509CRL) CertificateFactory.getInstance("X.509").generateCRL(crlStream);
}
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=1898738&r1=1898737&r2=1898738&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 Tue Mar 8 16:30:36 2022
@@ -21,7 +21,6 @@ package org.apache.pdfbox.examples.signa
import java.io.IOException;
import java.io.InputStream;
-import java.net.URL;
import java.security.GeneralSecurityException;
import java.security.InvalidKeyException;
import java.security.PublicKey;
@@ -47,6 +46,7 @@ import java.util.HashSet;
import java.util.Set;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.pdfbox.examples.signature.SigUtils;
import org.apache.pdfbox.pdmodel.encryption.SecurityProvider;
import org.bouncycastle.asn1.ASN1Encodable;
import org.bouncycastle.asn1.ASN1OctetString;
@@ -330,7 +330,7 @@ public final class CertificateVerifier
ASN1OctetString uri = (ASN1OctetString) location.getBaseObject();
String urlString = new String(uri.getOctets());
LOG.info("CA issuers URL: " + urlString);
- try (InputStream in = new URL(urlString).openStream())
+ try (InputStream in = SigUtils.openURL(urlString))
{
CertificateFactory certFactory = CertificateFactory.getInstance("X.509");
Collection<? extends Certificate> altCerts = certFactory.generateCertificates(in);
Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/validation/CertInformationCollector.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/validation/CertInformationCollector.java?rev=1898738&r1=1898737&r2=1898738&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/validation/CertInformationCollector.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/validation/CertInformationCollector.java Tue Mar 8 16:30:36 2022
@@ -20,7 +20,6 @@ package org.apache.pdfbox.examples.signa
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.net.URL;
import java.security.GeneralSecurityException;
import java.security.cert.CertificateException;
import java.security.cert.CertificateFactory;
@@ -32,6 +31,7 @@ import java.util.Set;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.pdfbox.examples.signature.SigUtils;
import org.apache.pdfbox.examples.signature.cert.CertificateVerifier;
import org.apache.pdfbox.pdmodel.encryption.SecurityProvider;
import org.apache.pdfbox.pdmodel.interactive.digitalsignature.PDSignature;
@@ -285,9 +285,8 @@ public class CertInformationCollector
LOG.info("Get alternative issuer certificate from: " + certInfo.issuerUrl);
try
{
- URL certUrl = new URL(certInfo.issuerUrl);
CertificateFactory certFactory = CertificateFactory.getInstance("X.509");
- try (InputStream in = certUrl.openStream())
+ try (InputStream in = SigUtils.openURL(certInfo.issuerUrl))
{
X509Certificate altIssuerCert = (X509Certificate) certFactory
.generateCertificate(in);