Skip to content

Commit 413b896

Browse files
committed
PDFBOX-5660: avoid default encoding
git-svn-id: https://svn.apache.org/repos/asf/pdfbox/trunk@1927210 13f79535-47bb-0310-9956-ffa450edef68
1 parent b7753d2 commit 413b896

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

examples/src/main/java/org/apache/pdfbox/examples/signature/cert/CertificateVerifier.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import java.io.IOException;
2323
import java.io.InputStream;
2424
import java.net.URISyntaxException;
25+
import java.nio.charset.StandardCharsets;
2526
import java.security.GeneralSecurityException;
2627
import java.security.PublicKey;
2728
import java.security.cert.CertPathBuilder;
@@ -327,7 +328,7 @@ public static Set<X509Certificate> downloadExtraCertificates(X509Extension ext)
327328
}
328329
ASN1TaggedObject location = (ASN1TaggedObject) obj.getObjectAt(1);
329330
ASN1OctetString uri = (ASN1OctetString) location.getBaseObject();
330-
String urlString = new String(uri.getOctets());
331+
String urlString = new String(uri.getOctets(), StandardCharsets.UTF_8);
331332
LOG.info("CA issuers URL: {}", urlString);
332333
try (InputStream in = SigUtils.openURL(urlString))
333334
{
@@ -432,7 +433,7 @@ private static String extractOCSPURL(X509Certificate cert) throws IOException
432433
&& location.getTagNo() == GeneralName.uniformResourceIdentifier)
433434
{
434435
ASN1OctetString url = (ASN1OctetString) location.getBaseObject();
435-
String ocspURL = new String(url.getOctets());
436+
String ocspURL = new String(url.getOctets(), StandardCharsets.UTF_8);
436437
LOG.info("OCSP URL: {}", ocspURL);
437438
return ocspURL;
438439
}

examples/src/main/java/org/apache/pdfbox/examples/signature/validation/CertInformationHelper.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package org.apache.pdfbox.examples.signature.validation;
1818

1919
import java.io.IOException;
20+
import java.nio.charset.StandardCharsets;
2021
import java.security.MessageDigest;
2122
import java.security.NoSuchAlgorithmException;
2223
import java.util.Enumeration;
@@ -86,12 +87,12 @@ protected static void getAuthorityInfoExtensionValue(byte[] extensionValue,
8687
&& location.getTagNo() == GeneralName.uniformResourceIdentifier)
8788
{
8889
ASN1OctetString url = (ASN1OctetString) location.getBaseObject();
89-
certInfo.setOcspUrl(new String(url.getOctets()));
90+
certInfo.setOcspUrl(new String(url.getOctets(), StandardCharsets.UTF_8));
9091
}
9192
else if (X509ObjectIdentifiers.id_ad_caIssuers.equals(oid))
9293
{
9394
ASN1OctetString uri = (ASN1OctetString) location.getBaseObject();
94-
certInfo.setIssuerUrl(new String(uri.getOctets()));
95+
certInfo.setIssuerUrl(new String(uri.getOctets(), StandardCharsets.UTF_8));
9596
}
9697
}
9798
}
@@ -152,7 +153,7 @@ else if (taggedObject.getBaseObject() instanceof ASN1Sequence)
152153
if (taggedObject.getBaseObject() instanceof ASN1OctetString)
153154
{
154155
ASN1OctetString uri = (ASN1OctetString) taggedObject.getBaseObject();
155-
String url = new String(uri.getOctets());
156+
String url = new String(uri.getOctets(), StandardCharsets.UTF_8);
156157

157158
// return first http(s)-Url for crl
158159
if (url.startsWith("http"))

0 commit comments

Comments
 (0)