dany/pdfio
1
0
Fork 0
mirror of https://github.com/michaelrsweet/pdfio.git synced 2025-04-21 16:06:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix encrypted PDF files with P values >2^31-1.

Browse Source
This commit is contained in:
Michael R Sweet 2025-04-20 17:33:56 -04:00
parent c23c6dec9a
commit e983ba98d8
No known key found for this signature in database
GPG Key ID: BE67C75EC81F3244
2 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pdfio-crypto.c
View File

@ -582,6 +582,7 @@ _pdfioCryptoUnlock(
file_idlen; // Length of file ID file_idlen; // Length of file ID
_pdfio_md5_t md5; // MD5 context _pdfio_md5_t md5; // MD5 context
uint8_t file_digest[16]; // MD5 digest of file ID and pad uint8_t file_digest[16]; // MD5 digest of file ID and pad
double p; // Permissions value as a double
// See if we support the type of encryption specified by the Encrypt object // See if we support the type of encryption specified by the Encrypt object
@ -689,8 +690,13 @@ _pdfioCryptoUnlock(
// Grab the remaining values we need to unlock the PDF... // Grab the remaining values we need to unlock the PDF...
pdf->file_keylen = (size_t)(length / 8); pdf->file_keylen = (size_t)(length / 8);
pdf->permissions = (pdfio_permission_t)pdfioDictGetNumber(encrypt_dict, "P");
p = pdfioDictGetNumber(encrypt_dict, "P");
PDFIO_DEBUG("_pdfioCryptoUnlock: P=%.0f\n", p);
if (p < 0x7fffffff) // Handle integers > 2^31-1
pdf->permissions = (pdfio_permission_t)p;
else
pdf->permissions = (pdfio_permission_t)(p - 4294967296.0);
PDFIO_DEBUG("_pdfioCryptoUnlock: permissions=%d\n", pdf->permissions); PDFIO_DEBUG("_pdfioCryptoUnlock: permissions=%d\n", pdf->permissions);
owner_key = pdfioDictGetBinary(encrypt_dict, "O", &owner_keylen); owner_key = pdfioDictGetBinary(encrypt_dict, "O", &owner_keylen);
@ -993,9 +999,11 @@ make_owner_key(
// Encrypt 20 times... // Encrypt 20 times...
uint8_t encrypt_key[16]; // RC4 encryption key uint8_t encrypt_key[16]; // RC4 encryption key
for (i = 0; i < 20; i ++) for (i = 20; i > 0;)
{ {
// XOR each byte in the digest with the loop counter to make a key... // XOR each byte in the digest with the loop counter to make a key...
i --;
for (j = 0; j < sizeof(encrypt_key); j ++) for (j = 0; j < sizeof(encrypt_key); j ++)
encrypt_key[j] = (uint8_t)(digest[j] ^ i); encrypt_key[j] = (uint8_t)(digest[j] ^ i);

24
pdfio-value.c
View File

@ -397,18 +397,22 @@ _pdfioValueRead(pdfio_file_t *pdf, // I - PDF file
ret = v; ret = v;
} }
else if ((timeval = get_date_time(token + 1)) != 0)
{
v->type = PDFIO_VALTYPE_DATE;
v->value.date = timeval;
ret = v;
}
else if (token[0] == '(') else if (token[0] == '(')
{ {
// String if ((timeval = get_date_time(token + 1)) != 0)
v->type = PDFIO_VALTYPE_STRING; {
v->value.string = pdfioStringCreate(pdf, token + 1); // Date
ret = v; v->type = PDFIO_VALTYPE_DATE;
v->value.date = timeval;
ret = v;
}
else
{
// String
v->type = PDFIO_VALTYPE_STRING;
v->value.string = pdfioStringCreate(pdf, token + 1);
ret = v;
}
} }
else if (token[0] == '/') else if (token[0] == '/')
{ {