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 2024/02/02 11:53:21 UTC
svn commit: r1915536 - in /pdfbox/trunk: examples/src/main/java/org/apache/pdfbox/examples/signature/ examples/src/main/java/org/apache/pdfbox/examples/signature/validation/ pdfbox/src/main/java/org/apache/pdfbox/cos/
Author: tilman
Date: Fri Feb 2 11:53:21 2024
New Revision: 1915536
URL: http://svn.apache.org/viewvc?rev=1915536&view=rev
Log:
PDFBOX-5660: add and use some COSNames
Modified:
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/ShowSignature.java
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/validation/AddValidationInformation.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSName.java
Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/ShowSignature.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/ShowSignature.java?rev=1915536&r1=1915535&r2=1915536&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/ShowSignature.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/ShowSignature.java Fri Feb 2 11:53:21 2024
@@ -623,23 +623,23 @@ public final class ShowSignature
private void analyseDSS(PDDocument document) throws IOException
{
PDDocumentCatalog catalog = document.getDocumentCatalog();
- COSBase dssElement = catalog.getCOSObject().getDictionaryObject("DSS");
+ COSBase dssElement = catalog.getCOSObject().getDictionaryObject(COSName.DSS);
if (dssElement instanceof COSDictionary)
{
COSDictionary dss = (COSDictionary) dssElement;
System.out.println("DSS Dictionary: " + dss);
- COSBase certsElement = dss.getDictionaryObject("Certs");
+ COSBase certsElement = dss.getDictionaryObject(COSName.CERTS);
if (certsElement instanceof COSArray)
{
printStreamsFromArray((COSArray) certsElement, "Cert");
}
- COSBase ocspsElement = dss.getDictionaryObject("OCSPs");
+ COSBase ocspsElement = dss.getDictionaryObject(COSName.OCSPS);
if (ocspsElement instanceof COSArray)
{
printStreamsFromArray((COSArray) ocspsElement, "Ocsp");
}
- COSBase crlElement = dss.getDictionaryObject("CRLs");
+ COSBase crlElement = dss.getDictionaryObject(COSName.CRLS);
if (crlElement instanceof COSArray)
{
printStreamsFromArray((COSArray) crlElement, "CRL");
Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/validation/AddValidationInformation.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/validation/AddValidationInformation.java?rev=1915536&r1=1915535&r2=1915536&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/validation/AddValidationInformation.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/validation/AddValidationInformation.java Fri Feb 2 11:53:21 2024
@@ -512,11 +512,11 @@ public class AddValidationInformation
addRevocationDataRecursive(certInfo);
if (correspondingOCSPs.size() > 0)
{
- vri.setItem("OCSP", correspondingOCSPs);
+ vri.setItem(COSName.OCSP, correspondingOCSPs);
}
if (correspondingCRLs.size() > 0)
{
- vri.setItem("CRL", correspondingCRLs);
+ vri.setItem(COSName.CRL, correspondingCRLs);
}
}
@@ -602,14 +602,14 @@ public class AddValidationInformation
{
COSDictionary dssExtensions = new COSDictionary();
dssExtensions.setDirect(true);
- catalog.getCOSObject().setItem("Extensions", dssExtensions);
+ catalog.getCOSObject().setItem(COSName.EXTENSIONS, dssExtensions);
COSDictionary adbeExtension = new COSDictionary();
adbeExtension.setDirect(true);
- dssExtensions.setItem("ADBE", adbeExtension);
+ dssExtensions.setItem(COSName.ADBE, adbeExtension);
- adbeExtension.setName("BaseVersion", "1.7");
- adbeExtension.setInt("ExtensionLevel", 5);
+ adbeExtension.setName(COSName.BASE_VERSION, "1.7");
+ adbeExtension.setInt(COSName.EXTENSION_LEVEL, 5);
catalog.setVersion("1.7");
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSName.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSName.java?rev=1915536&r1=1915535&r2=1915536&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSName.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSName.java Fri Feb 2 11:53:21 2024
@@ -49,12 +49,15 @@ public final class COSName extends COSBa
public static final COSName AC = getPDFName("AC");
public static final COSName ACRO_FORM = getPDFName("AcroForm");
public static final COSName ACTUAL_TEXT = getPDFName("ActualText");
+ public static final COSName ADBE = getPDFName("ADBE");
public static final COSName ADBE_PKCS7_DETACHED = getPDFName("adbe.pkcs7.detached");
public static final COSName ADBE_PKCS7_SHA1 = getPDFName("adbe.pkcs7.sha1");
public static final COSName ADBE_X509_RSA_SHA1 = getPDFName("adbe.x509.rsa_sha1");
public static final COSName ADOBE_PPKLITE = getPDFName("Adobe.PPKLite");
public static final COSName AESV2 = getPDFName("AESV2");
public static final COSName AESV3 = getPDFName("AESV3");
+ public static final COSName AF = getPDFName("AF");
+ public static final COSName AF_RELATIONSHIP = COSName.getPDFName("AFRelationship");
public static final COSName AFTER = getPDFName("After");
public static final COSName AI_META_DATA = getPDFName("AIMetaData");
public static final COSName AIS = getPDFName("AIS");
@@ -88,6 +91,7 @@ public final class COSName extends COSBa
public static final COSName BASE_ENCODING = getPDFName("BaseEncoding");
public static final COSName BASE_FONT = getPDFName("BaseFont");
public static final COSName BASE_STATE = getPDFName("BaseState");
+ public static final COSName BASE_VERSION = getPDFName("BaseVersion");
public static final COSName BBOX = getPDFName("BBox");
public static final COSName BC = getPDFName("BC");
public static final COSName BE = getPDFName("BE");
@@ -125,6 +129,7 @@ public final class COSName extends COSBa
public static final COSName CCITTFAX_DECODE_ABBREVIATION = getPDFName("CCF");
public static final COSName CENTER_WINDOW = getPDFName("CenterWindow");
public static final COSName CERT = getPDFName("Cert");
+ public static final COSName CERTS = getPDFName("Certs");
public static final COSName CF = getPDFName("CF");
public static final COSName CFM = getPDFName("CFM");
//** Acro form field type for choice fields.
@@ -169,6 +174,8 @@ public final class COSName extends COSBa
public static final COSName CP = getPDFName("CP");
public static final COSName CREATION_DATE = getPDFName("CreationDate");
public static final COSName CREATOR = getPDFName("Creator");
+ public static final COSName CRL = getPDFName("CRL");
+ public static final COSName CRLS = getPDFName("CRLS");
public static final COSName CROP_BOX = getPDFName("CropBox");
public static final COSName CRYPT = getPDFName("Crypt");
public static final COSName CS = getPDFName("CS");
@@ -219,7 +226,8 @@ public final class COSName extends COSBa
public static final COSName DOS = getPDFName("DOS");
public static final COSName DP = getPDFName("DP");
public static final COSName DR = getPDFName("DR");
- public static final COSName DS = getPDFName("DS");
+ public static final COSName DS = getPDFName("DS");
+ public static final COSName DSS = getPDFName("DSS");
public static final COSName DUPLEX = getPDFName("Duplex");
public static final COSName DUR = getPDFName("Dur");
public static final COSName DV = getPDFName("DV");
@@ -242,9 +250,12 @@ public final class COSName extends COSBa
public static final COSName ENCODING_ETEN_B5_V = getPDFName("ETen-B5-V");
public static final COSName ENCRYPT = getPDFName("Encrypt");
public static final COSName ENCRYPT_META_DATA = getPDFName("EncryptMetadata");
+ public static final COSName ENCRYPTED_PAYLOAD = getPDFName("EncryptedPayload");
public static final COSName END_OF_LINE = getPDFName("EndOfLine");
public static final COSName ENTRUST_PPKEF = getPDFName("Entrust.PPKEF");
public static final COSName EXCLUSION = getPDFName("Exclusion");
+ public static final COSName EXTENSIONS = getPDFName("Extensions");
+ public static final COSName EXTENSION_LEVEL = getPDFName("ExtensionLevel");
public static final COSName EX_DATA = getPDFName("ExData");
public static final COSName EXPORT = getPDFName("Export");
public static final COSName EXPORT_STATE = getPDFName("ExportState");
@@ -407,13 +418,15 @@ public final class COSName extends COSBa
// O
public static final COSName O = getPDFName("O");
public static final COSName OBJ = getPDFName("Obj");
- public static final COSName OBJR = new COSName("OBJR");
+ public static final COSName OBJR = getPDFName("OBJR");
public static final COSName OBJ_STM = getPDFName("ObjStm");
public static final COSName OC = getPDFName("OC");
public static final COSName OCG = getPDFName("OCG");
public static final COSName OCGS = getPDFName("OCGs");
public static final COSName OCMD = getPDFName("OCMD");
public static final COSName OCPROPERTIES = getPDFName("OCProperties");
+ public static final COSName OCSP = getPDFName("OCSP");
+ public static final COSName OCSPS = getPDFName("OCSPs");
public static final COSName OE = getPDFName("OE");
public static final COSName OID = getPDFName("OID");
@@ -574,6 +587,7 @@ public final class COSName extends COSBa
public static final COSName TEMPLATES = getPDFName("Templates");
public static final COSName THREAD = getPDFName("Thread");
public static final COSName THREADS = getPDFName("Threads");
+ public static final COSName THREE_DD = getPDFName("3DD");
public static final COSName THUMB = getPDFName("Thumb");
public static final COSName TI = getPDFName("TI");
public static final COSName TILING_TYPE = getPDFName("TilingType");
@@ -626,6 +640,7 @@ public final class COSName extends COSBa
public static final COSName VIEWER_PREFERENCES = getPDFName("ViewerPreferences");
public static final COSName VOLUME = getPDFName("Volume");
public static final COSName VP = getPDFName("VP");
+ public static final COSName VRI = getPDFName("VRI");
// W
public static final COSName W = getPDFName("W");
public static final COSName W2 = getPDFName("W2");