Skip to content

extract variables in StandardSecurityHandler.prepareEncryptionDictRev234 method #432

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

Open
valerybokov wants to merge 1 commit into
base: trunk
Choose a base branch
from
+10 −7
Open

extract variables in StandardSecurityHandler.prepareEncryptionDictRev234 method #432

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
17 changes: 10 additions & 7 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 @@ -522,13 +522,15 @@ private void prepareEncryptionDictRev234(String ownerPassword, String userPasswo
COSArray idArray = document.getDocument().getDocumentID();

//check if the document has an id yet. If it does not then generate one
byte[] userPasswordBytes = userPassword.getBytes(StandardCharsets.ISO_8859_1);
byte[] ownerPasswordBytes = ownerPassword.getBytes(StandardCharsets.ISO_8859_1);
if (idArray == null || idArray.size() < 2)
{
MessageDigest md = MessageDigests.getMD5();
BigInteger time = BigInteger.valueOf(System.currentTimeMillis());
md.update(time.toByteArray());
md.update(ownerPassword.getBytes(StandardCharsets.ISO_8859_1));
md.update(userPassword.getBytes(StandardCharsets.ISO_8859_1));
md.update(ownerPasswordBytes);
md.update(userPasswordBytes);
md.update(document.getDocument().toString().getBytes(StandardCharsets.ISO_8859_1));

byte[] id = md.digest(this.toString().getBytes(StandardCharsets.ISO_8859_1));
Expand All @@ -541,14 +543,15 @@ private void prepareEncryptionDictRev234(String ownerPassword, String userPasswo
COSString id = (COSString) idArray.getObject(0);

byte[] ownerBytes = computeOwnerPassword(
ownerPassword.getBytes(StandardCharsets.ISO_8859_1),
userPassword.getBytes(StandardCharsets.ISO_8859_1), revision, length);
ownerPasswordBytes,
userPasswordBytes, revision, length);

byte[] idBytes = id.getBytes();
byte[] userBytes = computeUserPassword(
userPassword.getBytes(StandardCharsets.ISO_8859_1),
ownerBytes, permissionInt, id.getBytes(), revision, length, true);
userPasswordBytes,
ownerBytes, permissionInt, idBytes, revision, length, true);

setEncryptionKey(computeEncryptedKeyRev234(userPassword.getBytes(StandardCharsets.ISO_8859_1), ownerBytes, permissionInt, id.getBytes(), true, length, revision));
setEncryptionKey(computeEncryptedKeyRev234(userPasswordBytes, ownerBytes, permissionInt, idBytes, true, length, revision));

encryptionDictionary.setOwnerKey(ownerBytes);
encryptionDictionary.setUserKey(userBytes);
Expand Down