Skip to content

use SecurityHandler.encryptDataRC4(byte[], byte[], OutputStream) method #505

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
valerybokov wants to merge 1 commit into from
Closed

use SecurityHandler.encryptDataRC4(byte[], byte[], OutputStream) method #505

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/StandardSecurityHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
*/
package org.apache.pdfbox.pdmodel.encryption;

import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.math.BigInteger;
Expand Down Expand Up @@ -888,7 +887,7 @@ else if (encRevision == REVISION_3 || encRevision == REVISION_4)
{
iterationKey[j] = (byte)(iterationKey[j] ^ i);
}
ByteArrayInputStream input = new ByteArrayInputStream(result.toByteArray());
byte[] input = result.toByteArray();
result.reset();
encryptDataRC4(iterationKey, input, result);
}
Expand Down Expand Up @@ -926,7 +925,7 @@ public byte[] computeOwnerPassword(byte[] ownerPassword, byte[] userPassword,
byte[] paddedUser = truncateOrPad( userPassword );

ByteArrayOutputStream encrypted = new ByteArrayOutputStream();
encryptDataRC4(rc4Key, new ByteArrayInputStream(paddedUser), encrypted);
encryptDataRC4(rc4Key, paddedUser, encrypted);

if (encRevision == REVISION_3 || encRevision == REVISION_4)
{
Expand All @@ -938,7 +937,7 @@ public byte[] computeOwnerPassword(byte[] ownerPassword, byte[] userPassword,
{
iterationKey[j] = (byte)(iterationKey[j] ^ (byte)i);
}
ByteArrayInputStream input = new ByteArrayInputStream( encrypted.toByteArray() );
byte[] input = encrypted.toByteArray();
encrypted.reset();
encryptDataRC4(iterationKey, input, encrypted );
}
Expand Down