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 2014/12/01 23:58:28 UTC
svn commit: r1642782 -
/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/parser/PreflightParser.java
Author: tilman
Date: Mon Dec 1 22:58:28 2014
New Revision: 1642782
URL: http://svn.apache.org/r1642782
Log:
PDFBOX-2533: add decryptDictionary method in preflightParser too
Modified:
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/parser/PreflightParser.java
Modified: pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/parser/PreflightParser.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/parser/PreflightParser.java?rev=1642782&r1=1642781&r2=1642782&view=diff
==============================================================================
--- pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/parser/PreflightParser.java (original)
+++ pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/parser/PreflightParser.java Mon Dec 1 22:58:28 2014
@@ -773,19 +773,11 @@ public class PreflightParser extends Non
// decrypt
if (pb instanceof COSString)
{
- decrypt((COSString) pb, objNr, objGenNr);
+ decryptString((COSString) pb, objNr, objGenNr);
}
else if (pb instanceof COSDictionary)
{
- for (Entry<COSName, COSBase> entry : ((COSDictionary) pb).entrySet())
- {
- // TODO: specially handle 'Contents' entry of signature dictionary like in
- // SecurityHandler#decryptDictionary
- if (entry.getValue() instanceof COSString)
- {
- decrypt((COSString) entry.getValue(), objNr, objGenNr);
- }
- }
+ decryptDictionary((COSDictionary) pb, objNr, objGenNr);
}
else if (pb instanceof COSArray)
{
@@ -794,7 +786,7 @@ public class PreflightParser extends Non
{
if (array.get(aIdx) instanceof COSString)
{
- decrypt((COSString) array.get(aIdx), objNr, objGenNr);
+ decryptString((COSString) array.get(aIdx), objNr, objGenNr);
}
}
}