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

Use big/little-endian conversion in pe_calc_realchecksum()

Browse Source
This commit is contained in:
olszomal 2023-02-08 14:44:50 +01:00 committed by Michał Trojnara
parent 8e74a05b40
commit 32b65659be
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
osslsigncode.c
View File

@ -2003,11 +2003,11 @@ static void pe_recalc_checksum(BIO *bio, FILE_HEADER *header)
static uint32_t pe_calc_realchecksum(char *indata, FILE_HEADER *header) static uint32_t pe_calc_realchecksum(char *indata, FILE_HEADER *header)
{ {
uint32_t n = 0, checksum = 0, size = 0; uint32_t n = 0, checkSum = 0, offset = 0;
BIO *bio = BIO_new(BIO_s_mem()); BIO *bio = BIO_new(BIO_s_mem());
unsigned short *buf = OPENSSL_malloc(SIZE_64K); unsigned short *buf = OPENSSL_malloc(SIZE_64K);
/* calculate the checksum */ /* calculate the checkSum */
while (n < header->fileend) { while (n < header->fileend) {
size_t i, written, nread; size_t i, written, nread;
size_t left = header->fileend - n; size_t left = header->fileend - n;
@ -2021,20 +2021,20 @@ static uint32_t pe_calc_realchecksum(char *indata, FILE_HEADER *header)
if (!BIO_read_ex(bio, buf, written, &nread)) if (!BIO_read_ex(bio, buf, written, &nread))
goto err; /* FAILED */ goto err; /* FAILED */
for (i = 0; i < nread / 2; i++) { for (i = 0; i < nread / 2; i++) {
val = buf[i]; val = LE_UINT16(buf[i]);
if (size == header->header_size + 88 || size == header->header_size + 90) if (offset == header->header_size + 88 || offset == header->header_size + 90)
val = 0; val = 0;
checksum += val; checkSum += val;
checksum = 0xffff & (checksum + (checksum >> 0x10)); checkSum = LOWORD(LOWORD(checkSum) + HIWORD(checkSum));
size += 2; offset += 2;
} }
} }
checksum = 0xffff & (checksum + (checksum >> 0x10)); checkSum = LOWORD(LOWORD(checkSum) + HIWORD(checkSum));
checksum += size; checkSum += offset;
err: err:
OPENSSL_free(buf); OPENSSL_free(buf);
BIO_free(bio); BIO_free(bio);
return checksum; return checkSum;
} }
static int verify_leaf_hash(X509 *leaf, const char *leafhash) static int verify_leaf_hash(X509 *leaf, const char *leafhash)