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

Fix timestamping nested signatures (#266)

Browse Source
This commit is contained in:
yjh-styx
2023-05-14 23:32:56 +03:00
committed by GitHub
parent b61bcaac2e
commit 56e7a72e8a
5 changed files with 18 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
osslsigncode.c
View File

@ -2258,6 +2258,9 @@ static void free_options(GLOBAL_OPTIONS *options)
/* If X509 structure is NULL nothing is done */
X509_free(options->cert);
options->cert = NULL;
/* If PKCS7 structure is NULL nothing is done */
PKCS7_free(options->prevsig);
options->prevsig = NULL;
/* Free up all elements of sk structure and sk itself */
sk_X509_pop_free(options->certs, X509_free);
options->certs = NULL;
@ -3671,6 +3674,13 @@ int main(int argc, char **argv)
PKCS7_free(p7);
DO_EXIT_0("Unable to set unauthenticated attributes\n");
}
if (options.prevsig) {
if (!cursig_set_nested(options.prevsig, p7, ctx))
DO_EXIT_0("Unable to append the nested signature to the current signature\n");
PKCS7_free(p7);
p7 = options.prevsig;
options.prevsig = NULL;
}
if (ctx->format->append_pkcs7) {
ret = ctx->format->append_pkcs7(ctx, outdata, p7);
if (ret) {