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

Simplify BIO chain free up and FILE_FORMAT_CTX cleanup

Browse Source
This commit is contained in:
olszomal 2024-02-28 15:12:20 +01:00 committed by Michał Trojnara
parent fa40c57f80
commit 3998bcabb2
8 changed files with 41 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
appx.c
View File

@ -256,8 +256,8 @@ static int appx_remove_pkcs7(FILE_FORMAT_CTX *ctx, BIO *hash, BIO *outdata);
static int appx_process_data(FILE_FORMAT_CTX *ctx, BIO *hash, BIO *outdata); static int appx_process_data(FILE_FORMAT_CTX *ctx, BIO *hash, BIO *outdata);
static PKCS7 *appx_pkcs7_signature_new(FILE_FORMAT_CTX *ctx, BIO *hash); static PKCS7 *appx_pkcs7_signature_new(FILE_FORMAT_CTX *ctx, BIO *hash);
static int appx_append_pkcs7(FILE_FORMAT_CTX *ctx, BIO *outdata, PKCS7 *p7); static int appx_append_pkcs7(FILE_FORMAT_CTX *ctx, BIO *outdata, PKCS7 *p7);
static BIO *appx_bio_free(BIO *hash, BIO *outdata); static void appx_bio_free(BIO *hash, BIO *outdata);
static void appx_ctx_cleanup(FILE_FORMAT_CTX *ctx, BIO *hash, BIO *outdata); static void appx_ctx_cleanup(FILE_FORMAT_CTX *ctx);
FILE_FORMAT file_format_appx = { FILE_FORMAT file_format_appx = {
.ctx_new = appx_ctx_new, .ctx_new = appx_ctx_new,
@ -757,11 +757,10 @@ static int appx_append_pkcs7(FILE_FORMAT_CTX *ctx, BIO *outdata, PKCS7 *p7)
* [out] outdata: outdata file BIO * [out] outdata: outdata file BIO
* [returns] none * [returns] none
*/ */
static BIO *appx_bio_free(BIO *hash, BIO *outdata) static void appx_bio_free(BIO *hash, BIO *outdata)
{ {
BIO_free_all(outdata); BIO_free_all(outdata);
BIO_free_all(hash); BIO_free_all(hash);
return NULL; /* OK */
} }
/* /*
@ -771,12 +770,8 @@ static BIO *appx_bio_free(BIO *hash, BIO *outdata)
* [in] outdata: outdata file BIO * [in] outdata: outdata file BIO
* [returns] none * [returns] none
*/ */
static void appx_ctx_cleanup(FILE_FORMAT_CTX *ctx, BIO *hash, BIO *outdata) static void appx_ctx_cleanup(FILE_FORMAT_CTX *ctx)
{ {
if (outdata) {
BIO_free_all(hash);
BIO_free_all(outdata);
}
freeZip(ctx->appx_ctx->zip); freeZip(ctx->appx_ctx->zip);
OPENSSL_free(ctx->appx_ctx->calculatedBMHash); OPENSSL_free(ctx->appx_ctx->calculatedBMHash);
OPENSSL_free(ctx->appx_ctx->calculatedCTHash); OPENSSL_free(ctx->appx_ctx->calculatedCTHash);

13
cab.c
View File

@ -54,8 +54,8 @@ static int cab_process_data(FILE_FORMAT_CTX *ctx, BIO *hash, BIO *outdata);
static PKCS7 *cab_pkcs7_signature_new(FILE_FORMAT_CTX *ctx, BIO *hash); static PKCS7 *cab_pkcs7_signature_new(FILE_FORMAT_CTX *ctx, BIO *hash);
static int cab_append_pkcs7(FILE_FORMAT_CTX *ctx, BIO *outdata, PKCS7 *p7); static int cab_append_pkcs7(FILE_FORMAT_CTX *ctx, BIO *outdata, PKCS7 *p7);
static void cab_update_data_size(FILE_FORMAT_CTX *ctx, BIO *outdata, PKCS7 *p7); static void cab_update_data_size(FILE_FORMAT_CTX *ctx, BIO *outdata, PKCS7 *p7);
static BIO *cab_bio_free(BIO *hash, BIO *outdata); static void cab_bio_free(BIO *hash, BIO *outdata);
static void cab_ctx_cleanup(FILE_FORMAT_CTX *ctx, BIO *hash, BIO *outdata); static void cab_ctx_cleanup(FILE_FORMAT_CTX *ctx);
static int cab_is_detaching_supported(void); static int cab_is_detaching_supported(void);
FILE_FORMAT file_format_cab = { FILE_FORMAT file_format_cab = {
@ -599,13 +599,11 @@ static void cab_update_data_size(FILE_FORMAT_CTX *ctx, BIO *outdata, PKCS7 *p7)
* [out] outdata: outdata file BIO (unused) * [out] outdata: outdata file BIO (unused)
* [returns] none * [returns] none
*/ */
static BIO *cab_bio_free(BIO *hash, BIO *outdata) static void cab_bio_free(BIO *hash, BIO *outdata)
{ {
/* squash the unused parameter warning */ /* squash the unused parameter warning */
(void)outdata; (void)outdata;
BIO_free_all(hash); BIO_free_all(hash);
return NULL;
} }
/* /*
@ -616,11 +614,8 @@ static BIO *cab_bio_free(BIO *hash, BIO *outdata)
* [in] outdata: outdata file BIO * [in] outdata: outdata file BIO
* [returns] none * [returns] none
*/ */
static void cab_ctx_cleanup(FILE_FORMAT_CTX *ctx, BIO *hash, BIO *outdata) static void cab_ctx_cleanup(FILE_FORMAT_CTX *ctx)
{ {
if (outdata) {
BIO_free_all(hash);
}
unmap_file(ctx->options->indata, ctx->cab_ctx->fileend); unmap_file(ctx->options->indata, ctx->cab_ctx->fileend);
OPENSSL_free(ctx->cab_ctx); OPENSSL_free(ctx->cab_ctx);
OPENSSL_free(ctx); OPENSSL_free(ctx);

13
cat.c
View File

@ -40,8 +40,8 @@ static int cat_verify_digests(FILE_FORMAT_CTX *ctx, PKCS7 *p7);
static PKCS7 *cat_pkcs7_extract(FILE_FORMAT_CTX *ctx); static PKCS7 *cat_pkcs7_extract(FILE_FORMAT_CTX *ctx);
static PKCS7 *cat_pkcs7_signature_new(FILE_FORMAT_CTX *ctx, BIO *hash); static PKCS7 *cat_pkcs7_signature_new(FILE_FORMAT_CTX *ctx, BIO *hash);
static int cat_append_pkcs7(FILE_FORMAT_CTX *ctx, BIO *outdata, PKCS7 *p7); static int cat_append_pkcs7(FILE_FORMAT_CTX *ctx, BIO *outdata, PKCS7 *p7);
static BIO *cat_bio_free(BIO *hash, BIO *outdata); static void cat_bio_free(BIO *hash, BIO *outdata);
static void cat_ctx_cleanup(FILE_FORMAT_CTX *ctx, BIO *hash, BIO *outdata); static void cat_ctx_cleanup(FILE_FORMAT_CTX *ctx);
FILE_FORMAT file_format_cat = { FILE_FORMAT file_format_cat = {
.ctx_new = cat_ctx_new, .ctx_new = cat_ctx_new,
@ -192,13 +192,11 @@ static int cat_append_pkcs7(FILE_FORMAT_CTX *ctx, BIO *outdata, PKCS7 *p7)
* [out] outdata: outdata file BIO (unused) * [out] outdata: outdata file BIO (unused)
* [returns] none * [returns] none
*/ */
static BIO *cat_bio_free(BIO *hash, BIO *outdata) static void cat_bio_free(BIO *hash, BIO *outdata)
{ {
/* squash the unused parameter warning */ /* squash the unused parameter warning */
(void)outdata; (void)outdata;
BIO_free_all(hash); BIO_free_all(hash);
return NULL;
} }
/* /*
@ -209,11 +207,8 @@ static BIO *cat_bio_free(BIO *hash, BIO *outdata)
* [in] outdata: outdata file BIO * [in] outdata: outdata file BIO
* [returns] none * [returns] none
*/ */
static void cat_ctx_cleanup(FILE_FORMAT_CTX *ctx, BIO *hash, BIO *outdata) static void cat_ctx_cleanup(FILE_FORMAT_CTX *ctx)
{ {
if (outdata) {
BIO_free_all(hash);
}
unmap_file(ctx->options->indata, ctx->cat_ctx->fileend); unmap_file(ctx->options->indata, ctx->cat_ctx->fileend);
PKCS7_free(ctx->cat_ctx->p7); PKCS7_free(ctx->cat_ctx->p7);
OPENSSL_free(ctx->cat_ctx); OPENSSL_free(ctx->cat_ctx);

13
msi.c
View File

@ -201,8 +201,8 @@ static int msi_remove_pkcs7(FILE_FORMAT_CTX *ctx, BIO *hash, BIO *outdata);
static int msi_process_data(FILE_FORMAT_CTX *ctx, BIO *hash, BIO *outdata); static int msi_process_data(FILE_FORMAT_CTX *ctx, BIO *hash, BIO *outdata);
static PKCS7 *msi_pkcs7_signature_new(FILE_FORMAT_CTX *ctx, BIO *hash); static PKCS7 *msi_pkcs7_signature_new(FILE_FORMAT_CTX *ctx, BIO *hash);
static int msi_append_pkcs7(FILE_FORMAT_CTX *ctx, BIO *outdata, PKCS7 *p7); static int msi_append_pkcs7(FILE_FORMAT_CTX *ctx, BIO *outdata, PKCS7 *p7);
static BIO *msi_bio_free(BIO *hash, BIO *outdata); static void msi_bio_free(BIO *hash, BIO *outdata);
static void msi_ctx_cleanup(FILE_FORMAT_CTX *ctx, BIO *hash, BIO *outdata); static void msi_ctx_cleanup(FILE_FORMAT_CTX *ctx);
static int msi_is_detaching_supported(void); static int msi_is_detaching_supported(void);
FILE_FORMAT file_format_msi = { FILE_FORMAT file_format_msi = {
@ -671,11 +671,10 @@ static int msi_append_pkcs7(FILE_FORMAT_CTX *ctx, BIO *outdata, PKCS7 *p7)
* [out] outdata: outdata file BIO * [out] outdata: outdata file BIO
* [returns] none * [returns] none
*/ */
static BIO *msi_bio_free(BIO *hash, BIO *outdata) static void msi_bio_free(BIO *hash, BIO *outdata)
{ {
BIO_free_all(hash); BIO_free_all(hash);
BIO_free_all(outdata); BIO_free_all(outdata);
return NULL;
} }
/* /*
@ -686,12 +685,8 @@ static BIO *msi_bio_free(BIO *hash, BIO *outdata)
* [out] outdata: outdata file BIO * [out] outdata: outdata file BIO
* [returns] none * [returns] none
*/ */
static void msi_ctx_cleanup(FILE_FORMAT_CTX *ctx, BIO *hash, BIO *outdata) static void msi_ctx_cleanup(FILE_FORMAT_CTX *ctx)
{ {
if (outdata) {
BIO_free_all(hash);
BIO_free_all(outdata);
}
unmap_file(ctx->options->indata, ctx->msi_ctx->fileend); unmap_file(ctx->options->indata, ctx->msi_ctx->fileend);
msi_file_free(ctx->msi_ctx->msi); msi_file_free(ctx->msi_ctx->msi);
msi_dirent_free(ctx->msi_ctx->dirent); msi_dirent_free(ctx->msi_ctx->dirent);

23
osslsigncode.c
View File

@ -2743,7 +2743,7 @@ static int verify_signed_file(FILE_FORMAT_CTX *ctx, GLOBAL_OPTIONS *options)
return 1; /* FAILED */ return 1; /* FAILED */
} }
p7 = cat_ctx->format->pkcs7_extract(cat_ctx); p7 = cat_ctx->format->pkcs7_extract(cat_ctx);
cat_ctx->format->ctx_cleanup(cat_ctx, NULL, NULL); cat_ctx->format->ctx_cleanup(cat_ctx);
OPENSSL_free(cat_options); OPENSSL_free(cat_options);
} else { } else {
if (!ctx->format->pkcs7_extract) { if (!ctx->format->pkcs7_extract) {
@ -2970,11 +2970,11 @@ static int check_attached_data(GLOBAL_OPTIONS *options)
} }
if (verify_signed_file(ctx, tmp_options)) { if (verify_signed_file(ctx, tmp_options)) {
printf("Signature mismatch\n"); printf("Signature mismatch\n");
ctx->format->ctx_cleanup(ctx, NULL, NULL); ctx->format->ctx_cleanup(ctx);
OPENSSL_free(tmp_options); OPENSSL_free(tmp_options);
return 1; /* Failed */ return 1; /* Failed */
} }
ctx->format->ctx_cleanup(ctx, NULL, NULL); ctx->format->ctx_cleanup(ctx);
OPENSSL_free(tmp_options); OPENSSL_free(tmp_options);
return 0; /* OK */ return 0; /* OK */
} }
@ -4440,6 +4440,7 @@ int main(int argc, char **argv)
} }
BIO_free_all(hash); BIO_free_all(hash);
BIO_free_all(outdata); BIO_free_all(outdata);
outdata = NULL;
ret = 1; /* FAILED */ ret = 1; /* FAILED */
DO_EXIT_0("Initialization error or unsupported input file type.\n"); DO_EXIT_0("Initialization error or unsupported input file type.\n");
} }
@ -4580,7 +4581,8 @@ int main(int argc, char **argv)
skip_signing: skip_signing:
if (ctx->format->bio_free) { if (ctx->format->bio_free) {
outdata = ctx->format->bio_free(hash, outdata); ctx->format->bio_free(hash, outdata);
outdata = NULL;
} }
if (!ret && options.cmd == CMD_ATTACH) { if (!ret && options.cmd == CMD_ATTACH) {
ret = check_attached_data(&options); ret = check_attached_data(&options);
@ -4594,12 +4596,17 @@ skip_signing:
} }
err_cleanup: err_cleanup:
if (outdata && options.outfile) { if (outdata) {
/* unlink outfile */ if (options.outfile) {
remove_file(options.outfile); /* unlink outfile */
remove_file(options.outfile);
}
if (hash)
BIO_free(hash);
BIO_free(outdata);
} }
if (ctx && ctx->format->ctx_cleanup) { if (ctx && ctx->format->ctx_cleanup) {
ctx->format->ctx_cleanup(ctx, hash, outdata); ctx->format->ctx_cleanup(ctx);
} }
#if OPENSSL_VERSION_NUMBER>=0x30000000L #if OPENSSL_VERSION_NUMBER>=0x30000000L
providers_cleanup(); providers_cleanup();

4
osslsigncode.h
View File

@ -523,8 +523,8 @@ struct file_format_st {
PKCS7 *(*pkcs7_signature_new) (FILE_FORMAT_CTX *ctx, BIO *hash); PKCS7 *(*pkcs7_signature_new) (FILE_FORMAT_CTX *ctx, BIO *hash);
int (*append_pkcs7) (FILE_FORMAT_CTX *ctx, BIO *outdata, PKCS7 *p7); int (*append_pkcs7) (FILE_FORMAT_CTX *ctx, BIO *outdata, PKCS7 *p7);
void (*update_data_size) (FILE_FORMAT_CTX *data, BIO *outdata, PKCS7 *p7); void (*update_data_size) (FILE_FORMAT_CTX *data, BIO *outdata, PKCS7 *p7);
BIO *(*bio_free) (BIO *hash, BIO *outdata); void (*bio_free) (BIO *hash, BIO *outdata);
void (*ctx_cleanup) (FILE_FORMAT_CTX *ctx, BIO *hash, BIO *outdata); void (*ctx_cleanup) (FILE_FORMAT_CTX *ctx);
int (*is_detaching_supported) (void); int (*is_detaching_supported) (void);
}; };

13
pe.c
View File

@ -56,8 +56,8 @@ static int pe_process_data(FILE_FORMAT_CTX *ctx, BIO *hash, BIO *outdata);
static PKCS7 *pe_pkcs7_signature_new(FILE_FORMAT_CTX *ctx, BIO *hash); static PKCS7 *pe_pkcs7_signature_new(FILE_FORMAT_CTX *ctx, BIO *hash);
static int pe_append_pkcs7(FILE_FORMAT_CTX *ctx, BIO *outdata, PKCS7 *p7); static int pe_append_pkcs7(FILE_FORMAT_CTX *ctx, BIO *outdata, PKCS7 *p7);
static void pe_update_data_size(FILE_FORMAT_CTX *ctx, BIO *outdata, PKCS7 *p7); static void pe_update_data_size(FILE_FORMAT_CTX *ctx, BIO *outdata, PKCS7 *p7);
static BIO *pe_bio_free(BIO *hash, BIO *outdata); static void pe_bio_free(BIO *hash, BIO *outdata);
static void pe_ctx_cleanup(FILE_FORMAT_CTX *ctx, BIO *hash, BIO *outdata); static void pe_ctx_cleanup(FILE_FORMAT_CTX *ctx);
static int pe_is_detaching_supported(void); static int pe_is_detaching_supported(void);
FILE_FORMAT file_format_pe = { FILE_FORMAT file_format_pe = {
@ -496,13 +496,11 @@ static void pe_update_data_size(FILE_FORMAT_CTX *ctx, BIO *outdata, PKCS7 *p7)
* [out] outdata: outdata file BIO (unused) * [out] outdata: outdata file BIO (unused)
* [returns] none * [returns] none
*/ */
static BIO *pe_bio_free(BIO *hash, BIO *outdata) static void pe_bio_free(BIO *hash, BIO *outdata)
{ {
/* squash the unused parameter warning */ /* squash the unused parameter warning */
(void)outdata; (void)outdata;
BIO_free_all(hash); BIO_free_all(hash);
return NULL;
} }
/* /*
@ -513,11 +511,8 @@ static BIO *pe_bio_free(BIO *hash, BIO *outdata)
* [in] outdata: outdata file BIO * [in] outdata: outdata file BIO
* [returns] none * [returns] none
*/ */
static void pe_ctx_cleanup(FILE_FORMAT_CTX *ctx, BIO *hash, BIO *outdata) static void pe_ctx_cleanup(FILE_FORMAT_CTX *ctx)
{ {
if (outdata) {
BIO_free_all(hash);
}
unmap_file(ctx->options->indata, ctx->pe_ctx->fileend); unmap_file(ctx->options->indata, ctx->pe_ctx->fileend);
OPENSSL_free(ctx->pe_ctx); OPENSSL_free(ctx->pe_ctx);
OPENSSL_free(ctx); OPENSSL_free(ctx);

14
script.c
View File

@ -62,8 +62,8 @@ static int script_remove_pkcs7(FILE_FORMAT_CTX *ctx, BIO *hash, BIO *outdata);
static int script_process_data(FILE_FORMAT_CTX *ctx, BIO *hash, BIO *outdata); static int script_process_data(FILE_FORMAT_CTX *ctx, BIO *hash, BIO *outdata);
static PKCS7 *script_pkcs7_signature_new(FILE_FORMAT_CTX *ctx, BIO *hash); static PKCS7 *script_pkcs7_signature_new(FILE_FORMAT_CTX *ctx, BIO *hash);
static int script_append_pkcs7(FILE_FORMAT_CTX *ctx, BIO *outdata, PKCS7 *p7); static int script_append_pkcs7(FILE_FORMAT_CTX *ctx, BIO *outdata, PKCS7 *p7);
static BIO *script_bio_free(BIO *hash, BIO *outdata); static void script_bio_free(BIO *hash, BIO *outdata);
static void script_ctx_cleanup(FILE_FORMAT_CTX *ctx, BIO *hash, BIO *outdata); static void script_ctx_cleanup(FILE_FORMAT_CTX *ctx);
static int script_is_detaching_supported(void); static int script_is_detaching_supported(void);
FILE_FORMAT file_format_script = { FILE_FORMAT file_format_script = {
@ -575,12 +575,10 @@ cleanup:
* [out] outdata: outdata file BIO * [out] outdata: outdata file BIO
* [returns] none * [returns] none
*/ */
static BIO *script_bio_free(BIO *hash, BIO *outdata) static void script_bio_free(BIO *hash, BIO *outdata)
{ {
BIO_free_all(hash); BIO_free_all(hash);
BIO_free_all(outdata); BIO_free_all(outdata);
/* FIXME: why doesn't the function return void instead of BIO *? */
return NULL;
} }
/* /*
@ -590,12 +588,8 @@ static BIO *script_bio_free(BIO *hash, BIO *outdata)
* [out] outdata: outdata file BIO * [out] outdata: outdata file BIO
* [returns] none * [returns] none
*/ */
static void script_ctx_cleanup(FILE_FORMAT_CTX *ctx, BIO *hash, BIO *outdata) static void script_ctx_cleanup(FILE_FORMAT_CTX *ctx)
{ {
if (outdata) {
BIO_free_all(hash);
BIO_free_all(outdata);
}
unmap_file(ctx->options->indata, ctx->script_ctx->fileend); unmap_file(ctx->options->indata, ctx->script_ctx->fileend);
OPENSSL_free(ctx->script_ctx); OPENSSL_free(ctx->script_ctx);
OPENSSL_free(ctx); OPENSSL_free(ctx);