svn commit: r1881842 - in /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption: PublicKeySecurityHandler.java SecurityHandler.java StandardSecurityHandler.java

[ti...@apache.org]

Author: tilman
Date: Sat Sep 19 08:59:44 2020
New Revision: 1881842

URL: http://svn.apache.org/viewvc?rev=1881842&view=rev
Log:
PDFBOX-4421: use getters/setters for keyLength and make it private, as suggested by Christian Appl

Modified:
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/PublicKeySecurityHandler.java
    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/PublicKeySecurityHandler.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/PublicKeySecurityHandler.java?rev=1881842&r1=1881841&r2=1881842&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/PublicKeySecurityHandler.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/PublicKeySecurityHandler.java Sat Sep 19 08:59:44 2020
@@ -98,7 +98,7 @@ public final class PublicKeySecurityHand
     public PublicKeySecurityHandler(PublicKeyProtectionPolicy publicKeyProtectionPolicy)
     {
         setProtectionPolicy(publicKeyProtectionPolicy);
-        this.keyLength = publicKeyProtectionPolicy.getEncryptionKeyLength();
+        setKeyLength(publicKeyProtectionPolicy.getEncryptionKeyLength());
     }
 
     /**
@@ -269,8 +269,8 @@ public final class PublicKeySecurityHand
             }
 
             // we have the encryption key ...
-            encryptionKey = new byte[this.keyLength / 8];
-            System.arraycopy(mdResult, 0, encryptionKey, 0, this.keyLength / 8);
+            encryptionKey = new byte[getKeyLength() / 8];
+            System.arraycopy(mdResult, 0, encryptionKey, 0, getKeyLength() / 8);
         }
         catch (CMSException | KeyStoreException | CertificateEncodingException e)
         {
@@ -321,7 +321,7 @@ public final class PublicKeySecurityHand
             }
 
             dictionary.setFilter(FILTER);
-            dictionary.setLength(this.keyLength);
+            dictionary.setLength(getKeyLength());
             int version = computeVersionNumber();
             dictionary.setVersion(version);
 
@@ -389,8 +389,8 @@ public final class PublicKeySecurityHand
                     break;
             }
 
-            this.encryptionKey = new byte[this.keyLength/8];
-            System.arraycopy(mdResult, 0, this.encryptionKey, 0, this.keyLength/8);
+            this.encryptionKey = new byte[getKeyLength() / 8];
+            System.arraycopy(mdResult, 0, this.encryptionKey, 0, getKeyLength() / 8);
 
             doc.setEncryptionDictionary(dictionary);
             doc.getDocument().setEncryptionDictionary(dictionary.getCOSObject());
@@ -405,7 +405,7 @@ public final class PublicKeySecurityHand
     {
         PDCryptFilterDictionary cryptFilterDictionary = new PDCryptFilterDictionary();
         cryptFilterDictionary.setCryptFilterMethod(aesVName);
-        cryptFilterDictionary.setLength(keyLength);
+        cryptFilterDictionary.setLength(getKeyLength());
         COSArray array = new COSArray();
         for (byte[] recipient : recipients)
         {

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=1881842&r1=1881841&r2=1881842&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 Sat Sep 19 08:59:44 2020
@@ -67,7 +67,7 @@ public abstract class SecurityHandler
     private static final byte[] AES_SALT = { (byte) 0x73, (byte) 0x41, (byte) 0x6c, (byte) 0x54 };
 
     /** The length in bits of the secret key used to encrypt the document. */
-    protected int keyLength = DEFAULT_KEY_LENGTH;
+    private int keyLength = DEFAULT_KEY_LENGTH;
 
     /** The encryption key that will used to encrypt / decrypt.*/
     protected byte[] encryptionKey;

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=1881842&r1=1881841&r2=1881842&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 Sat Sep 19 08:59:44 2020
@@ -89,7 +89,7 @@ public final class StandardSecurityHandl
     public StandardSecurityHandler(StandardProtectionPolicy standardProtectionPolicy)
     {
         setProtectionPolicy(standardProtectionPolicy);
-        keyLength = standardProtectionPolicy.getEncryptionKeyLength();
+        setKeyLength(standardProtectionPolicy.getEncryptionKeyLength());
     }
 
     /**
@@ -345,7 +345,7 @@ public final class StandardSecurityHandl
             encryptionDictionary.removeV45filters();
         }
         encryptionDictionary.setRevision(revision);
-        encryptionDictionary.setLength(keyLength);
+        encryptionDictionary.setLength(getKeyLength());
 
         StandardProtectionPolicy protectionPolicy = (StandardProtectionPolicy) getProtectionPolicy();
         String ownerPassword = protectionPolicy.getOwnerPassword();
@@ -369,7 +369,7 @@ public final class StandardSecurityHandl
 
         encryptionDictionary.setPermissions(permissionInt);
 
-        int length = keyLength/8;
+        int length = getKeyLength()/8;
 
         if (revision == 6)
         {
@@ -531,7 +531,7 @@ public final class StandardSecurityHandl
     {
         PDCryptFilterDictionary cryptFilterDictionary = new PDCryptFilterDictionary();
         cryptFilterDictionary.setCryptFilterMethod(aesVName);
-        cryptFilterDictionary.setLength(keyLength);
+        cryptFilterDictionary.setLength(getKeyLength());
         encryptionDictionary.setStdCryptFilterDictionary(cryptFilterDictionary);
         encryptionDictionary.setStreamFilterName(COSName.STD_CF);
         encryptionDictionary.setStringFilterName(COSName.STD_CF);