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

Fix control flow and braces for engine and provider support

Browse Source
This commit is contained in:
olszomal 2025-04-28 11:12:04 +02:00 committed by Michał Trojnara
parent d352dcc1a5
commit 475ea95ba3
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
osslsigncode.c
View File

@ -4226,12 +4226,12 @@ static int read_crypto_params(GLOBAL_OPTIONS *options)
/* Try to use PKCS#12 container with certificates and the private key ('-pkcs12' option) */ /* Try to use PKCS#12 container with certificates and the private key ('-pkcs12' option) */
if (options->pkcs12file) { if (options->pkcs12file) {
load_objects_from_store(options->pkcs12file, options->pass, &options->pkey, options->certs, options->crls); load_objects_from_store(options->pkcs12file, options->pass, &options->pkey, options->certs, options->crls);
}
#if !defined(OPENSSL_NO_ENGINE) || OPENSSL_VERSION_NUMBER>=0x30000000L #if !defined(OPENSSL_NO_ENGINE) || OPENSSL_VERSION_NUMBER>=0x30000000L
/* Security token */ /* Security token */
#ifndef OPENSSL_NO_ENGINE #ifndef OPENSSL_NO_ENGINE
/* PKCS#11 'dynamic' engine */ /* PKCS#11 'dynamic' engine */
} else if (options->p11engine) { else if (options->p11engine) {
if(!engine_load(options)) if(!engine_load(options))
goto out; goto out;
#endif /* OPENSSL_NO_ENGINE */ #endif /* OPENSSL_NO_ENGINE */
@ -4241,17 +4241,16 @@ static int read_crypto_params(GLOBAL_OPTIONS *options)
if ((options->provider && provider_load(options->provider)) || provider_load("pkcs11prov")) { if ((options->provider && provider_load(options->provider)) || provider_load("pkcs11prov")) {
load_objects_from_store(options->keyfile, options->pass, &options->pkey, NULL, NULL); load_objects_from_store(options->keyfile, options->pass, &options->pkey, NULL, NULL);
load_objects_from_store(options->p11cert, options->pass, NULL, options->certs, NULL); load_objects_from_store(options->p11cert, options->pass, NULL, options->certs, NULL);
} else { } else
#endif /* OPENSSL_VERSION_NUMBER>=0x30000000L */ #endif /* OPENSSL_VERSION_NUMBER>=0x30000000L */
#ifndef OPENSSL_NO_ENGINE #ifndef OPENSSL_NO_ENGINE
/* try to find and load libp11 'pkcs11' engine */ /* try to find and load libp11 'pkcs11' engine */
if (!engine_load(options)) { if (!engine_load(options))
goto out; goto out;
#endif /* OPENSSL_NO_ENGINE */ #endif /* OPENSSL_NO_ENGINE */
} }
}
#endif /* !defined(OPENSSL_NO_ENGINE) || OPENSSL_VERSION_NUMBER>=0x30000000L */ #endif /* !defined(OPENSSL_NO_ENGINE) || OPENSSL_VERSION_NUMBER>=0x30000000L */
} else { else {
/* Load the the private key ('-key' option) */ /* Load the the private key ('-key' option) */
load_objects_from_store(options->keyfile, options->pass, &options->pkey, NULL, NULL); load_objects_from_store(options->keyfile, options->pass, &options->pkey, NULL, NULL);
} }
@ -4273,7 +4272,9 @@ static int read_crypto_params(GLOBAL_OPTIONS *options)
if (sk_X509_num(options->certs) == 0 && !read_pkcs7_certfile(options)) { if (sk_X509_num(options->certs) == 0 && !read_pkcs7_certfile(options)) {
return 0; /* FAILED */ return 0; /* FAILED */
} }
#if !defined(OPENSSL_NO_ENGINE) || OPENSSL_VERSION_NUMBER>=0x30000000L
out: out:
#endif /* !defined(OPENSSL_NO_ENGINE) || OPENSSL_VERSION_NUMBER>=0x30000000L */
return (options->pkey && sk_X509_num(options->certs) > 0) ? 1 : 0; return (options->pkey && sk_X509_num(options->certs) > 0) ? 1 : 0;
} }