Author: tilman
Date: Mon Jul 14 03:42:28 2025
New Revision: 1927211
URL: http://svn.apache.org/viewvc?rev=1927211&view=rev
Log:
PDFBOX-5660: avoid default encoding
Modified:
pdfbox/branches/2.0/examples/src/main/java/org/apache/pdfbox/examples/signature/cert/CertificateVerifier.java
pdfbox/branches/2.0/examples/src/main/java/org/apache/pdfbox/examples/signature/validation/CertInformationHelper.java
Modified:
pdfbox/branches/2.0/examples/src/main/java/org/apache/pdfbox/examples/signature/cert/CertificateVerifier.java
URL:
http://svn.apache.org/viewvc/pdfbox/branches/2.0/examples/src/main/java/org/apache/pdfbox/examples/signature/cert/CertificateVerifier.java?rev=1927211&r1=1927210&r2=1927211&view=diff
==============================================================================
---
pdfbox/branches/2.0/examples/src/main/java/org/apache/pdfbox/examples/signature/cert/CertificateVerifier.java
(original)
+++
pdfbox/branches/2.0/examples/src/main/java/org/apache/pdfbox/examples/signature/cert/CertificateVerifier.java
Mon Jul 14 03:42:28 2025
@@ -47,6 +47,7 @@ import org.apache.commons.logging.LogFac
import org.apache.pdfbox.examples.signature.SigUtils;
import org.apache.pdfbox.io.IOUtils;
import org.apache.pdfbox.pdmodel.encryption.SecurityProvider;
+import org.apache.pdfbox.util.Charsets;
import org.bouncycastle.asn1.ASN1Encodable;
import org.bouncycastle.asn1.ASN1OctetString;
import org.bouncycastle.asn1.ASN1Primitive;
@@ -344,7 +345,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(), Charsets.UTF_8);
InputStream in = null;
try
{
@@ -458,7 +459,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(),
Charsets.UTF_8);
LOG.info("OCSP URL: " + ocspURL);
return ocspURL;
}
Modified:
pdfbox/branches/2.0/examples/src/main/java/org/apache/pdfbox/examples/signature/validation/CertInformationHelper.java
URL:
http://svn.apache.org/viewvc/pdfbox/branches/2.0/examples/src/main/java/org/apache/pdfbox/examples/signature/validation/CertInformationHelper.java?rev=1927211&r1=1927210&r2=1927211&view=diff
==============================================================================
---
pdfbox/branches/2.0/examples/src/main/java/org/apache/pdfbox/examples/signature/validation/CertInformationHelper.java
(original)
+++
pdfbox/branches/2.0/examples/src/main/java/org/apache/pdfbox/examples/signature/validation/CertInformationHelper.java
Mon Jul 14 03:42:28 2025
@@ -24,6 +24,7 @@ import java.util.Enumeration;
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.Charsets;
import org.apache.pdfbox.util.Hex;
import org.bouncycastle.asn1.ASN1Encodable;
import org.bouncycastle.asn1.ASN1OctetString;
@@ -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(),
Charsets.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(),
Charsets.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(), Charsets.UTF_8);
// return first http(s)-Url for crl
if (url.startsWith("http"))
