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

Fix update_data_size()

Browse Source
This commit is contained in:
olszomal 2023-03-29 15:06:15 +02:00 committed by Michał Trojnara
parent dd365d68c4
commit 7bfe3b5db9
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cab.c
View File

@ -556,8 +556,9 @@ static void cab_update_data_size(FILE_FORMAT_CTX *ctx, BIO *outdata, PKCS7 *p7)
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
}; };
if (ctx->options->cmd == CMD_VERIFY || ctx->options->cmd == CMD_EXTRACT if (!p7) {
|| ctx->options->cmd == CMD_REMOVE) { /* CMD_REMOVE
* additional header does not exist so additional data size is unused */
return; return;
} }
(void)BIO_seek(outdata, 0x30); (void)BIO_seek(outdata, 0x30);

3
osslsigncode.c
View File

@ -3547,6 +3547,9 @@ int main(int argc, char **argv)
goto skip_signing; goto skip_signing;
} else if (options.cmd == CMD_REMOVE && ctx->format->remove_pkcs7) { } else if (options.cmd == CMD_REMOVE && ctx->format->remove_pkcs7) {
ret = ctx->format->remove_pkcs7(ctx, hash, outdata); ret = ctx->format->remove_pkcs7(ctx, hash, outdata);
if (ctx->format->update_data_size) {
ctx->format->update_data_size(ctx, outdata, NULL);
}
goto skip_signing; goto skip_signing;
} else if (ctx->format->pkcs7_prepare) { } else if (ctx->format->pkcs7_prepare) {
p7 = ctx->format->pkcs7_prepare(ctx, hash, outdata); p7 = ctx->format->pkcs7_prepare(ctx, hash, outdata);

10
pe.c
View File

@ -519,10 +519,7 @@ static void pe_update_data_size(FILE_FORMAT_CTX *ctx, BIO *outdata, PKCS7 *p7)
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
}; };
if (ctx->options->cmd == CMD_VERIFY || ctx->options->cmd == CMD_EXTRACT) { if (p7) {
return;
}
if (ctx->options->cmd != CMD_REMOVE) {
int len = i2d_PKCS7(p7, NULL); int len = i2d_PKCS7(p7, NULL);
int padlen = len % 8 ? 8 - len % 8 : 0; int padlen = len % 8 ? 8 - len % 8 : 0;
@ -534,9 +531,10 @@ static void pe_update_data_size(FILE_FORMAT_CTX *ctx, BIO *outdata, PKCS7 *p7)
BIO_write(outdata, buf, 4); BIO_write(outdata, buf, 4);
PUT_UINT32_LE(len + 8 + padlen, buf); PUT_UINT32_LE(len + 8 + padlen, buf);
BIO_write(outdata, buf, 4); BIO_write(outdata, buf, 4);
} } /* else CMD_REMOVE */
checksum = pe_calc_checksum(outdata, ctx->pe_ctx->header_size);
/* write back checksum */ /* write back checksum */
checksum = pe_calc_checksum(outdata, ctx->pe_ctx->header_size);
(void)BIO_seek(outdata, ctx->pe_ctx->header_size + 88); (void)BIO_seek(outdata, ctx->pe_ctx->header_size + 88);
PUT_UINT32_LE(checksum, buf); PUT_UINT32_LE(checksum, buf);
BIO_write(outdata, buf, 4); BIO_write(outdata, buf, 4);