nhyatt/osslsigncode
1
0
Fork 0
mirror of https://github.com/mtrojnar/osslsigncode.git synced 2025-04-05 01:00:11 -05:00
Code Issues Projects Releases Wiki Activity

Inspect PE attribute certificate table

Browse Source
This commit is contained in:
olszomal 2023-03-29 13:54:26 +02:00 committed by Michał Trojnara
parent e4aa06f0c0
commit 09555e8c05
1 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
pe.c
View File

@ -177,7 +177,7 @@ static ASN1_OBJECT *pe_spc_image_data_get(u_char **p, int *plen, FILE_FORMAT_CTX
*/ */
static int pe_check_file(FILE_FORMAT_CTX *ctx, int detached) static int pe_check_file(FILE_FORMAT_CTX *ctx, int detached)
{ {
uint32_t real_pe_checksum; uint32_t real_pe_checksum, sum = 0;
if (!ctx) { if (!ctx) {
printf("Init error\n\n"); printf("Init error\n\n");
@ -200,8 +200,20 @@ static int pe_check_file(FILE_FORMAT_CTX *ctx, int detached)
printf("No signature found\n\n"); printf("No signature found\n\n");
return 0; /* FAILED */ return 0; /* FAILED */
} }
if (ctx->pe_ctx->siglen != GET_UINT32_LE(ctx->options->indata + ctx->pe_ctx->sigpos)) { /*
printf("Invalid signature\n\n"); * If the sum of the rounded dwLength values does not equal the Size value,
* then either the attribute certificate table or the Size field is corrupted.
*/
while (sum < ctx->pe_ctx->siglen) {
uint32_t len = GET_UINT32_LE(ctx->options->indata + ctx->pe_ctx->sigpos + sum);
if (len % 8)
len += (8 - len % 8);
sum += len;
}
if (sum != ctx->pe_ctx->siglen) {
printf("Corrupted attribute certificate table\n");
printf("Attribute certificate table size : %08X\n", ctx->pe_ctx->siglen);
printf("Sum of the rounded dwLength values: %08X\n\n", sum);
return 0; /* FAILED */ return 0; /* FAILED */
} }
return 1; /* OK */ return 1; /* OK */
@ -671,16 +683,18 @@ static PKCS7 *pe_pkcs7_get_file(char *indata, PE_CTX *pe_ctx)
return NULL; /* FAILED */ return NULL; /* FAILED */
} }
while (pos < pe_ctx->siglen) { while (pos < pe_ctx->siglen) {
uint32_t l = GET_UINT32_LE(indata + pe_ctx->sigpos + pos); uint32_t len = GET_UINT32_LE(indata + pe_ctx->sigpos + pos);
uint16_t certrev = GET_UINT16_LE(indata + pe_ctx->sigpos + pos + 4); uint16_t certrev = GET_UINT16_LE(indata + pe_ctx->sigpos + pos + 4);
uint16_t certtype = GET_UINT16_LE(indata + pe_ctx->sigpos + pos + 6); uint16_t certtype = GET_UINT16_LE(indata + pe_ctx->sigpos + pos + 6);
if (certrev == WIN_CERT_REVISION_2_0 && certtype == WIN_CERT_TYPE_PKCS_SIGNED_DATA) { if (certrev == WIN_CERT_REVISION_2_0 && certtype == WIN_CERT_TYPE_PKCS_SIGNED_DATA) {
/* skip 8 bytes from the attribute certificate table */
const u_char *blob = (u_char *)indata + pe_ctx->sigpos + pos + 8; const u_char *blob = (u_char *)indata + pe_ctx->sigpos + pos + 8;
return d2i_PKCS7(NULL, &blob, l - 8); return d2i_PKCS7(NULL, &blob, len - 8);
} }
if (l%8) /* quadword align data */
l += (8 - l%8); if (len % 8)
pos += l; len += (8 - len % 8);
pos += len;
} }
return NULL; /* FAILED */ return NULL; /* FAILED */
} }