You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by le...@apache.org on 2014/05/14 19:01:19 UTC
svn commit: r1594642 -
/pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/SecurityHandler.java
Author: lehmi
Date: Wed May 14 17:01:19 2014
New Revision: 1594642
URL: http://svn.apache.org/r1594642
Log:
PDFBOX-1895: decrypt dictionaries recursive
Modified:
pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/SecurityHandler.java (contents, props changed)
Modified: pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/SecurityHandler.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/SecurityHandler.java?rev=1594642&r1=1594641&r2=1594642&view=diff
==============================================================================
--- pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/SecurityHandler.java (original)
+++ pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/SecurityHandler.java Wed May 14 17:01:19 2014
@@ -447,15 +447,15 @@ public abstract class SecurityHandler
for (Map.Entry<COSName, COSBase> entry : dictionary.entrySet())
{
COSBase value = entry.getValue();
- // within a dictionary only strings and streams have to be decrypted
- if (value instanceof COSString || value instanceof COSStream || value instanceof COSArray)
+ // within a dictionary only the following kind of COS objects have to be decrypted
+ if (value instanceof COSString || value instanceof COSStream || value instanceof COSArray || value instanceof COSDictionary)
{
// if we are a signature dictionary and contain a Contents entry then
// we don't decrypt it.
- if (!(entry.getKey().getName().equals("Contents") && value instanceof COSString && potentialSignatures
+ if (!(entry.getKey().equals(COSName.CONTENTS) && value instanceof COSString && potentialSignatures
.contains(dictionary)))
{
- decrypt(entry.getValue(), objNum, genNum);
+ decrypt(value, objNum, genNum);
}
}
}
Propchange: pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/SecurityHandler.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed May 14 17:01:19 2014
@@ -0,0 +1 @@
+/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/SecurityHandler.java:1460370,1460372,1461796,1465163,1465217,1465266,1465359-1465360,1465366,1467638,1468195,1469999,1470107,1470242,1476795,1477806,1478472,1479136,1479287,1480000,1480030,1484089,1484277,1484547,1485771,1485781,1486337,1486413,1486423,1486440,1487557,1488049,1490022-1490023,1490408,1493503,1494083,1495799,1495802-1495803,1497532,1504210,1504214,1505737,1509187,1512367,1512433,1512661,1515101,1515165,1515905,1517273,1517281,1517288,1519174,1521194,1528826,1528833,1530018,1530740,1535953,1535956,1536136,1536173,1536441,1536463,1537287,1538191,1538203,1538222,1538341,1538371,1538394-1538395,1540801,1540811,1541625,1541714,1541987,1542291,1542780,1544789,1544806,1544818,1544972,1544977,1548387,1548394,1549022,1549025,1549027,1551220,1552521,1552533,1552552,1553017,1553175,1553220,1554632,1554774,1554792,1554845,1555186,1555345,1555550,1557339,1557374,1557546,1557553,1557561,1557793,1558205,1558570,
1561095,1561191,1563199,1563210,1563215,1563426,1563429,1564846,1588736,1594639