Marmelator/pdf.js.mirror
1
0
Fork 0
mirror of https://github.com/mozilla/pdf.js.git synced 2026-07-25 08:27:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #21580 from calixteman/issue21579

Browse Source 
Fix decryption of AES-256 revision 5 PDFs with non-ASCII passwords
This commit is contained in:
calixteman 2026-07-16 16:42:42 +02:00 committed by GitHub
commit e909f1f64f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 57 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/crypto.js
View File

@ -1130,7 +1130,7 @@ class CipherTransformFactory {
const fileIdBytes = stringToBytes(fileId);
let passwordBytes;
if (password) {
if (revision === 6) {
if (algorithm === 5) {
try {
password = utf8StringToString(password);
} catch {

1
test/pdfs/.gitignore vendored
View File

@ -943,3 +943,4 @@
!issue17333.pdf
!issue20504.pdf
!issue20504_skia.pdf
!issue21579.pdf

BIN
test/pdfs/issue21579.pdf Normal file
View File

Binary file not shown.

8
test/test_manifest.json
View File

@ -14463,5 +14463,13 @@
"rounds": 1,
"lastPage": 1,
"type": "eq"
},
{
"id": "issue21579",
"file": "pdfs/issue21579.pdf",
"md5": "3e067e3d08edfcb84b70b50937cf247f",
"rounds": 1,
"type": "eq",
"password": "pässwört"
}
]

47
test/unit/crypto_spec.js
View File

@ -616,6 +616,7 @@ describe("CipherTransformFactory", function () {
let fileId1, fileId2, dict1, dict2, dict3;
let aes256Dict, aes256IsoDict, aes256BlankDict, aes256IsoBlankDict;
let aes256UnicodeDict;
beforeAll(function () {
fileId1 = unescape("%F6%C6%AF%17%F3rR%8DRM%9A%80%D1%EF%DF%18");
@ -753,11 +754,38 @@ describe("CipherTransformFactory", function () {
P: -1084,
R: 6,
});
aes256UnicodeDict = buildDict({
Filter: Name.get("Standard"),
V: 5,
Length: 256,
O: unescape(
"%07%E7%C3%30%6B%EE%F5%54%BD%69%11%AC%82%48%76%0C%9D%F0%5A%5C" +
"%9E%63%29%9A%24%A0%C2%A1%5B%22%90%30%33%33%33%33%33%33%33%33" +
"%44%44%44%44%44%44%44%44"
),
U: unescape(
"%B0%B5%E1%DA%16%13%4D%FE%F0%0C%4D%09%F2%EE%F2%6A%38%67%49%85" +
"%81%10%8D%A0%4F%3E%5D%24%B9%B5%F3%78%11%11%11%11%11%11%11%11" +
"%22%22%22%22%22%22%22%22"
),
OE: unescape(
"%7A%2C%97%53%F5%6C%7C%7C%CA%2F%83%3E%2D%32%33%90%57%DB%21%B9" +
"%ED%D2%4B%6F%7D%D9%71%9B%4B%9B%65%42"
),
UE: unescape(
"%8C%EE%2C%8A%D2%16%82%DC%BB%DF%65%52%72%96%07%C4%AB%6C%99%54" +
"%A7%42%BE%BA%43%9F%66%47%F2%68%66%B8"
),
Perms: unescape("%E9%4D%1D%8D%96%BE%D3%A9%8D%BD%A6%BE%3E%1A%2A%AD"),
P: -1084,
R: 5,
});
});
afterAll(function () {
fileId1 = fileId2 = dict1 = dict2 = dict3 = null;
aes256Dict = aes256IsoDict = aes256BlankDict = aes256IsoBlankDict = null;
aes256UnicodeDict = null;
});
describe("#ctor", function () {
@ -779,6 +807,25 @@ describe("CipherTransformFactory", function () {
});
});
describe("AES256 Revision 5 with a non-ASCII password", function () {
it("should accept UTF-8 user password", function () {
ensurePasswordCorrect(aes256UnicodeDict, fileId1, "pässwört");
});
it("should accept UTF-8 owner password", function () {
ensurePasswordCorrect(aes256UnicodeDict, fileId1, "Öwner");
});
it("should not accept the UTF-8 bytes as a Latin-1 password", function () {
ensurePasswordIncorrect(
aes256UnicodeDict,
fileId1,
unescape("p%C3%A4ssw%C3%B6rt")
);
});
it("should not accept wrong password", function () {
ensurePasswordIncorrect(aes256UnicodeDict, fileId1, "wrong");
});
});
describe("AES256 Revision 6", function () {
it("should accept user password", function () {
ensurePasswordCorrect(aes256IsoDict, fileId1, "user");