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 2016/01/07 21:20:29 UTC
svn commit: r1723624 -
/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/PDFParser.java
Author: tilman
Date: Thu Jan 7 20:20:28 2016
New Revision: 1723624
URL: http://svn.apache.org/viewvc?rev=1723624&view=rev
Log:
PDFBOX-2729: pass encryption to PDDocument
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/PDFParser.java
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/PDFParser.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/PDFParser.java?rev=1723624&r1=1723623&r2=1723624&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/PDFParser.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/PDFParser.java Thu Jan 7 20:20:28 2016
@@ -46,6 +46,7 @@ public class PDFParser extends COSParser
private InputStream keyStoreInputStream = null;
private String keyAlias = null;
+ private PDEncryption encryption = null;
private AccessPermission accessPermission;
/**
@@ -169,7 +170,9 @@ public class PDFParser extends COSParser
*/
public PDDocument getPDDocument() throws IOException
{
- return new PDDocument( getDocument(), source, accessPermission );
+ PDDocument doc = new PDDocument(getDocument(), source, accessPermission);
+ doc.setEncryptionDictionary(encryption);
+ return doc;
}
/**
@@ -276,8 +279,7 @@ public class PDFParser extends COSParser
}
try
{
- PDEncryption encryption = new PDEncryption(document.getEncryptionDictionary());
-
+ encryption = new PDEncryption(document.getEncryptionDictionary());
DecryptionMaterial decryptionMaterial;
if (keyStoreInputStream != null)
{