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

Check signature length, CID 1519389

Browse Source
This commit is contained in:
olszomal 2023-01-20 12:42:56 +01:00 committed by Michał Trojnara
parent f3af509973
commit 5981c740c9
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
osslsigncode.c
View File

@ -3574,6 +3574,10 @@ static PKCS7 *pe_extract_existing_pkcs7(char *indata, FILE_HEADER *header)
uint32_t pos = 0; uint32_t pos = 0;
PKCS7 *p7 = NULL; PKCS7 *p7 = NULL;
if (header->siglen == 0 || header->siglen > header->fileend) {
printf("Corrupted signature length: 0x%08X\n", header->siglen);
return NULL; /* FAILED */
}
while (pos < header->siglen) { while (pos < header->siglen) {
uint32_t l = GET_UINT32_LE(indata + header->sigpos + pos); uint32_t l = GET_UINT32_LE(indata + header->sigpos + pos);
uint16_t certrev = GET_UINT16_LE(indata + header->sigpos + pos + 4); uint16_t certrev = GET_UINT16_LE(indata + header->sigpos + pos + 4);
@ -3664,9 +3668,11 @@ static int pe_verify_header(char *indata, char *infile, uint32_t filesize, FILE_
return 0; /* FAILED */ return 0; /* FAILED */
} }
/* SizeOfHeaders field specifies the combined size of an MS-DOS stub, PE header, /* SizeOfHeaders field specifies the combined size of an MS-DOS stub, PE header,
* and section headers rounded up to a multiple of FileAlignment. */ * and section headers rounded up to a multiple of FileAlignment.
* SizeOfHeaders must be < filesize and cannot be < 0x0000002C (44) in Windows 7
* because of a bug when checking section names for compatibility purposes */
header->header_size = GET_UINT32_LE(indata + 60); header->header_size = GET_UINT32_LE(indata + 60);
if (filesize < header->header_size) { if (header->header_size < 44 || header->header_size > filesize) {
printf("Unexpected SizeOfHeaders field: 0x%08X\n", header->header_size); printf("Unexpected SizeOfHeaders field: 0x%08X\n", header->header_size);
return 0; /* FAILED */ return 0; /* FAILED */
} }
@ -5587,6 +5593,7 @@ static PKCS7 *get_sigfile(char *sigfile, file_type_t type)
} else { } else {
/* reset header */ /* reset header */
memset(&header, 0, sizeof(FILE_HEADER)); memset(&header, 0, sizeof(FILE_HEADER));
header.fileend = sigfilesize;
header.siglen = sigfilesize; header.siglen = sigfilesize;
header.sigpos = 0; header.sigpos = 0;
if (type == FILE_TYPE_PE) if (type == FILE_TYPE_PE)