Simplify error handling in PKCS#7 certificate loading, CID 1639170

olszomal · mtrojnar · commit e7405fa83935 · 2025-03-31T13:19:35.000+02:00
diff --git a/osslsigncode.c b/osslsigncode.c
@@ -4269,7 +4269,7 @@ static int read_crypto_params(GLOBAL_OPTIONS *options)
 
     /* OpenSSL store API does not support PKCS#7 format */
     if (sk_X509_num(options->certs) == 0 && !read_pkcs7_certfile(options)) {
-        goto out;
+        return 0; /* FAILED */
     }
 out:
     return (options->pkey && sk_X509_num(options->certs) > 0) ? 1 : 0;

Original file line number	Diff line number	Diff line change
`@@ -4269,7 +4269,7 @@ static int read_crypto_params(GLOBAL_OPTIONS *options)`
`4269`	`4269`
`4270`	`4270`	`/* OpenSSL store API does not support PKCS#7 format */`
`4271`	`4271`	`if (sk_X509_num(options->certs) == 0 && !read_pkcs7_certfile(options)) {`
`4272`		`- goto out;`
	`4272`	`+ return 0; /* FAILED */`
`4273`	`4273`	`}`
`4274`	`4274`	`out:`
`4275`	`4275`	`return (options->pkey && sk_X509_num(options->certs) > 0) ? 1 : 0;`