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

Use big/little-endian conversion.

Browse Source 
Improve checksum calculation.
This commit is contained in:
olszomal 2022-09-20 10:50:28 +02:00 committed by Michał Trojnara
parent 8c113b3a86
commit 7aca21b481
3 changed files with 48 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
msi.c
View File

@ -34,7 +34,7 @@ static uint32_t get_fat_sector_location(MSI_FILE *msi, uint32_t fatSectorNumber)
const u_char *address; const u_char *address;
if (fatSectorNumber < DIFAT_IN_HEADER) { if (fatSectorNumber < DIFAT_IN_HEADER) {
return msi->m_hdr->headerDIFAT[fatSectorNumber]; return LE_UINT32(msi->m_hdr->headerDIFAT[fatSectorNumber]);
} else { } else {
fatSectorNumber -= DIFAT_IN_HEADER; fatSectorNumber -= DIFAT_IN_HEADER;
entriesPerSector = msi->m_sectorSize / 4 - 1; entriesPerSector = msi->m_sectorSize / 4 - 1;

34
msi.h
View File

@ -103,6 +103,40 @@
#define SIZE_64K 65536 /* 2^16 */ #define SIZE_64K 65536 /* 2^16 */
#define SIZE_16M 16777216 /* 2^24 */ #define SIZE_16M 16777216 /* 2^24 */
/*
* Macro names:
* linux: __BYTE_ORDER == __LITTLE_ENDIAN | __BIG_ENDIAN
* BYTE_ORDER == LITTLE_ENDIAN | BIG_ENDIAN
* bsd: _BYTE_ORDER == _LITTLE_ENDIAN | _BIG_ENDIAN
* BYTE_ORDER == LITTLE_ENDIAN | BIG_ENDIAN
* solaris: _LITTLE_ENDIAN | _BIG_ENDIAN
*/
#ifndef BYTE_ORDER
#define LITTLE_ENDIAN 1234
#define BIG_ENDIAN 4321
#define BYTE_ORDER LITTLE_ENDIAN
#endif /* BYTE_ORDER */
#if !defined(BYTE_ORDER) || !defined(LITTLE_ENDIAN) || !defined(BIG_ENDIAN)
#error "Cannot determine the endian-ness of this platform"
#endif
#define LOWORD(x) (x & 0xFFFF)
#define HIWORD(x) (x >> 16)
#if BYTE_ORDER == BIG_ENDIAN
#define LE_UINT16(x) ((((x) >> 8) & 0x00FF) | \
(((x) << 8) & 0xFF00))
#define LE_UINT32(x) (((x) >> 24) | \
(((x) & 0x00FF0000) >> 8) | \
(((x) & 0x0000FF00) << 8) | \
((x) << 24))
#else
#define LE_UINT16(x) (x)
#define LE_UINT32(x) (x)
#endif /* BYTE_ORDER == BIG_ENDIAN */
typedef unsigned char u_char; typedef unsigned char u_char;
typedef struct { typedef struct {

22
osslsigncode.c
View File

@ -1817,9 +1817,13 @@ static int set_indirect_data_blob(PKCS7 *sig, BIO *hash, file_type_t type,
return 1; /* OK */ return 1; /* OK */
} }
/*
* A signed PE file is padded (with 0's) to 8 byte boundary.
* Ignore any last odd byte in an unsigned file.
*/
static uint32_t pe_calc_checksum(BIO *bio, FILE_HEADER *header) static uint32_t pe_calc_checksum(BIO *bio, FILE_HEADER *header)
{ {
uint32_t checksum = 0, size = 0; uint32_t checkSum = 0, offset = 0;
int nread; int nread;
unsigned short *buf = OPENSSL_malloc(SIZE_64K); unsigned short *buf = OPENSSL_malloc(SIZE_64K);
@ -1829,18 +1833,18 @@ static uint32_t pe_calc_checksum(BIO *bio, FILE_HEADER *header)
unsigned short val; unsigned short val;
int i; int i;
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;
} }
} }
OPENSSL_free(buf); OPENSSL_free(buf);
checksum = 0xffff & (checksum + (checksum >> 0x10)); checkSum = LOWORD(LOWORD(checkSum) + HIWORD(checkSum));
checksum += size; checkSum += offset;
return checksum; return checkSum;
} }
static void pe_recalc_checksum(BIO *bio, FILE_HEADER *header) static void pe_recalc_checksum(BIO *bio, FILE_HEADER *header)