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 2015/05/03 17:01:39 UTC
svn commit: r1677413 - in
/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption:
SecurityHandler.java StandardSecurityHandler.java
Author: tilman
Date: Sun May 3 15:01:38 2015
New Revision: 1677413
URL: http://svn.apache.org/r1677413
Log:
PDFBOX-2576: refactored to remove unused version field
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/SecurityHandler.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/StandardSecurityHandler.java
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/SecurityHandler.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/SecurityHandler.java?rev=1677413&r1=1677412&r2=1677413&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/SecurityHandler.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/SecurityHandler.java Sun May 3 15:01:38 2015
@@ -69,9 +69,6 @@ public abstract class SecurityHandler
// see 7.6.2, page 58, PDF 32000-1:2008
private static final byte[] AES_SALT = { (byte) 0x73, (byte) 0x41, (byte) 0x6c, (byte) 0x54 };
- /** The value of V field of the Encryption dictionary. */
- protected int version;
-
/** The length of the secret key used to encrypt the document. */
protected int keyLength = DEFAULT_KEY_LENGTH;
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/StandardSecurityHandler.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/StandardSecurityHandler.java?rev=1677413&r1=1677412&r2=1677413&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/StandardSecurityHandler.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/StandardSecurityHandler.java Sun May 3 15:01:38 2015
@@ -121,10 +121,12 @@ public final class StandardSecurityHandl
* Computes the revision version of the StandardSecurityHandler to
* use regarding the version number and the permissions bits set.
* See PDF Spec 1.6 p98
+ *
+ * @param version The version number.
*
* @return The computed revision number.
*/
- private int computeRevisionNumber()
+ private int computeRevisionNumber(int version)
{
if(version < 2 && !policy.getPermissions().hasAnyRevision3PermissionSet())
{
@@ -331,8 +333,8 @@ public final class StandardSecurityHandl
{
encryptionDictionary = new PDEncryption();
}
- version = computeVersionNumber();
- int revision = computeRevisionNumber();
+ int version = computeVersionNumber();
+ int revision = computeRevisionNumber(version);
encryptionDictionary.setFilter(FILTER);
encryptionDictionary.setVersion(version);
if (version != 4 && version != 5)