dany/pdfio
1
0
Fork 0
mirror of https://github.com/michaelrsweet/pdfio.git synced 2024-12-26 05:18:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix Windows builds.

Browse Source
This commit is contained in:
Michael R Sweet 2021-10-26 07:12:41 -04:00
parent b865390b5d
commit fafe24bdb6
3 changed files with 32 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pdfio-crypto.c
View File

@ -12,9 +12,14 @@
// //
#include "pdfio-private.h" #include "pdfio-private.h"
#if !_WIN32 #if _WIN32
# include <windows.h>
# include <bcrypt.h>
# include <sys/types.h>
# include <sys/timeb.h>
#else
# include <sys/time.h> # include <sys/time.h>
#endif // !_WIN32 #endif // _WIN32
#ifdef __has_include #ifdef __has_include
# if __has_include(<sys/random.h>) # if __has_include(<sys/random.h>)
# define HAVE_GETRANDOM 1 # define HAVE_GETRANDOM 1
@ -116,14 +121,8 @@ _pdfioCryptoLock(
const char *user_password) // I - User password, if any const char *user_password) // I - User password, if any
{ {
pdfio_dict_t *dict; // Encryption dictionary pdfio_dict_t *dict; // Encryption dictionary
size_t i, j; // Looping vars
_pdfio_md5_t md5; // MD5 context
uint8_t digest[16]; // 128-bit MD5 digest
_pdfio_rc4_t rc4; // RC4 encryption context
size_t len; // Length of password
uint8_t owner_pad[32], // Padded owner password uint8_t owner_pad[32], // Padded owner password
user_pad[32], // Padded user password user_pad[32], // Padded user password
perm_bytes[4], // Permissions bytes
*file_id; // File ID bytes *file_id; // File ID bytes
size_t file_idlen; // Length of file ID size_t file_idlen; // Length of file ID
pdfio_dict_t *cf_dict, // CF dictionary pdfio_dict_t *cf_dict, // CF dictionary
@ -567,9 +566,9 @@ _pdfioCryptoUnlock(
} }
handler = pdfioDictGetName(encrypt_dict, "Filter"); handler = pdfioDictGetName(encrypt_dict, "Filter");
version = pdfioDictGetNumber(encrypt_dict, "V"); version = (int)pdfioDictGetNumber(encrypt_dict, "V");
revision = pdfioDictGetNumber(encrypt_dict, "R"); revision = (int)pdfioDictGetNumber(encrypt_dict, "R");
length = pdfioDictGetNumber(encrypt_dict, "Length"); length = (int)pdfioDictGetNumber(encrypt_dict, "Length");
stream_filter = pdfioDictGetName(encrypt_dict, "StmF"); stream_filter = pdfioDictGetName(encrypt_dict, "StmF");
string_filter = pdfioDictGetName(encrypt_dict, "StrF"); string_filter = pdfioDictGetName(encrypt_dict, "StrF");
cf_dict = pdfioDictGetDict(encrypt_dict, "CF"); cf_dict = pdfioDictGetDict(encrypt_dict, "CF");
@ -625,7 +624,7 @@ _pdfioCryptoUnlock(
// Grab the remaining values we need to unlock the PDF... // Grab the remaining values we need to unlock the PDF...
pdf->file_keylen = length / 8; pdf->file_keylen = length / 8;
pdf->permissions = pdfioDictGetNumber(encrypt_dict, "P"); pdf->permissions = (pdfio_permission_t)pdfioDictGetNumber(encrypt_dict, "P");
owner_key = pdfioDictGetBinary(encrypt_dict, "O", &owner_keylen); owner_key = pdfioDictGetBinary(encrypt_dict, "O", &owner_keylen);
user_key = pdfioDictGetBinary(encrypt_dict, "U", &user_keylen); user_key = pdfioDictGetBinary(encrypt_dict, "U", &user_keylen);
@ -667,7 +666,6 @@ _pdfioCryptoUnlock(
{ {
uint8_t pad[32], // Padded password uint8_t pad[32], // Padded password
file_key[16], // File key file_key[16], // File key
owner_key[32], // Owner key
user_pad[32], // Padded user password user_pad[32], // Padded user password
user_key[32], // User key user_key[32], // User key
pdf_user_key[32]; // Decrypted user key pdf_user_key[32]; // Decrypted user key
@ -832,11 +830,10 @@ make_file_key(
const uint8_t *owner_key, // I - Owner key const uint8_t *owner_key, // I - Owner key
uint8_t file_key[16]) // O - Encryption key uint8_t file_key[16]) // O - Encryption key
{ {
size_t i, j; // Looping vars size_t i; // Looping var
uint8_t perm_bytes[4]; // Permissions bytes uint8_t perm_bytes[4]; // Permissions bytes
_pdfio_md5_t md5; // MD5 context _pdfio_md5_t md5; // MD5 context
uint8_t digest[16]; // 128-bit MD5 digest uint8_t digest[16]; // 128-bit MD5 digest
_pdfio_rc4_t rc4; // RC4 encryption context
perm_bytes[0] = (uint8_t)permissions; perm_bytes[0] = (uint8_t)permissions;
@ -937,7 +934,6 @@ make_user_key(
uint8_t user_key[32]) // O - User key uint8_t user_key[32]) // O - User key
{ {
_pdfio_md5_t md5; // MD5 context _pdfio_md5_t md5; // MD5 context
uint8_t digest[16]; // 128-bit MD5 digest
// Generate a base hash from known values... // Generate a base hash from known values...

5
pdfio.vcxproj
View File

@ -148,13 +148,18 @@
<ClInclude Include="ttf.h" /> <ClInclude Include="ttf.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="pdfio-aes.c" />
<ClCompile Include="pdfio-array.c" /> <ClCompile Include="pdfio-array.c" />
<ClCompile Include="pdfio-common.c" /> <ClCompile Include="pdfio-common.c" />
<ClCompile Include="pdfio-content.c" /> <ClCompile Include="pdfio-content.c" />
<ClCompile Include="pdfio-crypto.c" />
<ClCompile Include="pdfio-dict.c" /> <ClCompile Include="pdfio-dict.c" />
<ClCompile Include="pdfio-file.c" /> <ClCompile Include="pdfio-file.c" />
<ClCompile Include="pdfio-md5.c" />
<ClCompile Include="pdfio-object.c" /> <ClCompile Include="pdfio-object.c" />
<ClCompile Include="pdfio-page.c" /> <ClCompile Include="pdfio-page.c" />
<ClCompile Include="pdfio-rc4.c" />
<ClCompile Include="pdfio-sha256.c" />
<ClCompile Include="pdfio-stream.c" /> <ClCompile Include="pdfio-stream.c" />
<ClCompile Include="pdfio-string.c" /> <ClCompile Include="pdfio-string.c" />
<ClCompile Include="pdfio-token.c" /> <ClCompile Include="pdfio-token.c" />

15
pdfio.vcxproj.filters
View File

@ -65,6 +65,21 @@
<ClCompile Include="ttf.c"> <ClCompile Include="ttf.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="pdfio-aes.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="pdfio-crypto.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="pdfio-md5.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="pdfio-rc4.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="pdfio-sha256.c">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="packages.config" /> <None Include="packages.config" />