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 2021/10/02 12:48:37 UTC
svn commit: r1893813 - in
/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption:
ProtectionPolicy.java SecurityHandler.java
Author: tilman
Date: Sat Oct 2 12:48:37 2021
New Revision: 1893813
URL: http://svn.apache.org/viewvc?rev=1893813&view=rev
Log:
PDFBOX-4892: reduce memory usage, as suggested by valerybokov
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/ProtectionPolicy.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/SecurityHandler.java
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/ProtectionPolicy.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/ProtectionPolicy.java?rev=1893813&r1=1893812&r2=1893813&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/ProtectionPolicy.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/ProtectionPolicy.java Sat Oct 2 12:48:37 2021
@@ -30,9 +30,9 @@ package org.apache.pdfbox.pdmodel.encryp
public abstract class ProtectionPolicy
{
- private static final int DEFAULT_KEY_LENGTH = 40;
+ private static final short DEFAULT_KEY_LENGTH = 40;
- private int encryptionKeyLength = DEFAULT_KEY_LENGTH;
+ private short encryptionKeyLength = DEFAULT_KEY_LENGTH;
private boolean preferAES = false;
/**
@@ -49,7 +49,7 @@ public abstract class ProtectionPolicy
{
throw new IllegalArgumentException("Invalid key length '" + l + "' value must be 40, 128 or 256!");
}
- encryptionKeyLength = l;
+ encryptionKeyLength = (short) l;
}
/**
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=1893813&r1=1893812&r2=1893813&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 Oct 2 12:48:37 2021
@@ -63,13 +63,13 @@ public abstract class SecurityHandler<T_
{
private static final Log LOG = LogFactory.getLog(SecurityHandler.class);
- private static final int DEFAULT_KEY_LENGTH = 40;
+ private static final short DEFAULT_KEY_LENGTH = 40;
// 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 length in bits of the secret key used to encrypt the document. */
- private int keyLength = DEFAULT_KEY_LENGTH;
+ private short keyLength = DEFAULT_KEY_LENGTH;
/** The encryption key that will used to encrypt / decrypt.*/
private byte[] encryptionKey;
@@ -128,7 +128,7 @@ public abstract class SecurityHandler<T_
protected SecurityHandler(T_POLICY protectionPolicy)
{
this.protectionPolicy = protectionPolicy;
- keyLength = protectionPolicy.getEncryptionKeyLength();
+ keyLength = (short) protectionPolicy.getEncryptionKeyLength();
}
/**
@@ -693,7 +693,7 @@ public abstract class SecurityHandler<T_
*/
public void setKeyLength(int keyLen)
{
- this.keyLength = keyLen;
+ this.keyLength = (short) keyLen;
}
/**