Author: tilman
Date: Mon Jul 14 03:42:23 2025
New Revision: 1927210
URL: http://svn.apache.org/viewvc?rev=1927210&view=rev
Log:
PDFBOX-5660: avoid default encoding
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=1927210&r1=1927209&r2=1927210&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 Jul 14 03:42:23 2025
@@ -22,6 +22,7 @@ package org.apache.pdfbox.examples.signa
import java.io.IOException;
import java.io.InputStream;
import java.net.URISyntaxException;
+import java.nio.charset.StandardCharsets;
import java.security.GeneralSecurityException;
import java.security.PublicKey;
import java.security.cert.CertPathBuilder;
@@ -327,7 +328,7 @@ public final class CertificateVerifier
}
ASN1TaggedObject location = (ASN1TaggedObject) obj.getObjectAt(1);
ASN1OctetString uri = (ASN1OctetString) location.getBaseObject();
- String urlString = new String(uri.getOctets());
+ String urlString = new String(uri.getOctets(),
StandardCharsets.UTF_8);
LOG.info("CA issuers URL: {}", urlString);
try (InputStream in = SigUtils.openURL(urlString))
{
@@ -432,7 +433,7 @@ public final class CertificateVerifier
&& location.getTagNo() ==
GeneralName.uniformResourceIdentifier)
{
ASN1OctetString url = (ASN1OctetString)
location.getBaseObject();
- String ocspURL = new String(url.getOctets());
+ String ocspURL = new String(url.getOctets(),
StandardCharsets.UTF_8);
LOG.info("OCSP URL: {}", ocspURL);
return ocspURL;
}
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=1927210&r1=1927209&r2=1927210&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 Jul 14 03:42:23 2025
@@ -17,6 +17,7 @@
package org.apache.pdfbox.examples.signature.validation;
import java.io.IOException;
+import java.nio.charset.StandardCharsets;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.Enumeration;
@@ -86,12 +87,12 @@ public class CertInformationHelper
&& location.getTagNo() ==
GeneralName.uniformResourceIdentifier)
{
ASN1OctetString url = (ASN1OctetString)
location.getBaseObject();
- certInfo.setOcspUrl(new String(url.getOctets()));
+ certInfo.setOcspUrl(new String(url.getOctets(),
StandardCharsets.UTF_8));
}
else if (X509ObjectIdentifiers.id_ad_caIssuers.equals(oid))
{
ASN1OctetString uri = (ASN1OctetString)
location.getBaseObject();
- certInfo.setIssuerUrl(new String(uri.getOctets()));
+ certInfo.setIssuerUrl(new String(uri.getOctets(),
StandardCharsets.UTF_8));
}
}
}
@@ -152,7 +153,7 @@ public class CertInformationHelper
if (taggedObject.getBaseObject() instanceof ASN1OctetString)
{
ASN1OctetString uri = (ASN1OctetString)
taggedObject.getBaseObject();
- String url = new String(uri.getOctets());
+ String url = new String(uri.getOctets(), StandardCharsets.UTF_8);
// return first http(s)-Url for crl
if (url.startsWith("http"))
