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

msi_calc_digest() with FILE_HEADER parameter

Browse Source
This commit is contained in:
olszomal 2023-02-08 10:19:10 +01:00 committed by Michał Trojnara
parent 83e47e0252
commit 8e74a05b40
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
msi.c
View File

@ -734,7 +734,7 @@ out:
} }
/* Compute a simple sha1/sha256 message digest of the MSI file */ /* Compute a simple sha1/sha256 message digest of the MSI file */
int msi_calc_digest(char *indata, int mdtype, u_char *mdbuf, uint32_t fileend) int msi_calc_digest(char *indata, int mdtype, u_char *mdbuf, FILE_HEADER *header)
{ {
const EVP_MD *md = EVP_get_digestbynid(mdtype); const EVP_MD *md = EVP_get_digestbynid(mdtype);
BIO *bhash = BIO_new(BIO_f_md()); BIO *bhash = BIO_new(BIO_f_md());
@ -745,7 +745,7 @@ int msi_calc_digest(char *indata, int mdtype, u_char *mdbuf, uint32_t fileend)
return 0; /* FAILED */ return 0; /* FAILED */
} }
BIO_push(bhash, BIO_new(BIO_s_null())); BIO_push(bhash, BIO_new(BIO_s_null()));
if (!bio_hash_data(indata, bhash, 0, 0, fileend)) { if (!bio_hash_data(indata, bhash, 0, 0, header->fileend)) {
printf("Unable to calculate digest\n"); printf("Unable to calculate digest\n");
BIO_free_all(bhash); BIO_free_all(bhash);
return 0; /* FAILED */ return 0; /* FAILED */

14
msi.h
View File

@ -143,6 +143,18 @@
typedef unsigned char u_char; typedef unsigned char u_char;
typedef struct {
uint32_t header_size;
uint32_t pe32plus;
uint16_t magic;
uint32_t pe_checksum;
uint32_t nrvas;
uint32_t sigpos;
uint32_t siglen;
uint32_t fileend;
uint16_t flags;
} FILE_HEADER;
typedef struct { typedef struct {
u_char signature[8]; /* 0xd0, 0xcf, 0x11, 0xe0, 0xa1, 0xb1, 0x1a, 0xe1 */ u_char signature[8]; /* 0xd0, 0xcf, 0x11, 0xe0, 0xa1, 0xb1, 0x1a, 0xe1 */
u_char unused_clsid[16]; /* reserved and unused */ u_char unused_clsid[16]; /* reserved and unused */
@ -260,7 +272,7 @@ MSI_ENTRY *msi_signatures_get(MSI_DIRENT *dirent, MSI_ENTRY **dse);
void msi_dirent_free(MSI_DIRENT *dirent); void msi_dirent_free(MSI_DIRENT *dirent);
int msi_prehash_dir(MSI_DIRENT *dirent, BIO *hash, int is_root); int msi_prehash_dir(MSI_DIRENT *dirent, BIO *hash, int is_root);
int msi_hash_dir(MSI_FILE *msi, MSI_DIRENT *dirent, BIO *hash, int is_root); int msi_hash_dir(MSI_FILE *msi, MSI_DIRENT *dirent, BIO *hash, int is_root);
int msi_calc_digest(char *indata, int mdtype, u_char *mdbuf, uint32_t fileend); int msi_calc_digest(char *indata, int mdtype, u_char *mdbuf, FILE_HEADER *header);
int msi_dirent_delete(MSI_DIRENT *dirent, const u_char *name, uint16_t nameLen); int msi_dirent_delete(MSI_DIRENT *dirent, const u_char *name, uint16_t nameLen);
int msi_file_write(MSI_FILE *msi, MSI_DIRENT *dirent, u_char *p, uint32_t len, int msi_file_write(MSI_FILE *msi, MSI_DIRENT *dirent, u_char *p, uint32_t len,
u_char *p_msiex, uint32_t len_msiex, BIO *outdata); u_char *p_msiex, uint32_t len_msiex, BIO *outdata);

14
osslsigncode.c
View File

@ -257,18 +257,6 @@ typedef struct {
#endif /* OPENSSL_VERSION_NUMBER>=0x30000000L */ #endif /* OPENSSL_VERSION_NUMBER>=0x30000000L */
} GLOBAL_OPTIONS; } GLOBAL_OPTIONS;
typedef struct {
uint32_t header_size;
uint32_t pe32plus;
uint16_t magic;
uint32_t pe_checksum;
uint32_t nrvas;
uint32_t sigpos;
uint32_t siglen;
uint32_t fileend;
uint16_t flags;
} FILE_HEADER;
typedef struct { typedef struct {
EVP_PKEY *pkey; EVP_PKEY *pkey;
X509 *cert; X509 *cert;
@ -4490,7 +4478,7 @@ static int cat_verify_member(CatalogAuthAttr *attribute, char *indata, FILE_HEAD
goto out; goto out;
break; break;
case FILE_TYPE_MSI: case FILE_TYPE_MSI:
if (!msi_calc_digest(indata, mdtype, cmdbuf, header->fileend)) if (!msi_calc_digest(indata, mdtype, cmdbuf, header))
goto out; goto out;
break; break;
default: default: