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

Support loading arbitrary engines via ENGINE_by_id()

Browse Source 
Use ENGINE_by_id() for any engine name that doesn't contain a dot,
assuming it's an engine ID. If the name includes a dot (e.g., a file
extension), treat it as a path to a dynamic engine module.

See #436 for discussion.
This commit is contained in:
Michał Trojnara
2025-06-02 13:59:45 +02:00
parent 62438908cb
commit 9b7dae4572
1 changed files with 9 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
osslsigncode.c
View File

@ -4166,21 +4166,6 @@ static ENGINE *engine_dynamic(GLOBAL_OPTIONS *options)
return engine; return engine;
} }
/*
* Load a pkcs11 engine
* [in] none
* [returns] pointer to ENGINE
*/
static ENGINE *engine_pkcs11(void)
{
ENGINE *engine = ENGINE_by_id("pkcs11");
if (!engine) {
fprintf(stderr, "Failed to find and load 'pkcs11' engine\n");
return NULL; /* FAILED */
}
return engine; /* OK */
}
/* /*
* Load the private key and the signer certificate from a security token * Load the private key and the signer certificate from a security token
* [in, out] options: structure holds the input data * [in, out] options: structure holds the input data
@ -4260,12 +4245,18 @@ static int read_token(GLOBAL_OPTIONS *options, ENGINE *engine)
static int engine_load(GLOBAL_OPTIONS *options) static int engine_load(GLOBAL_OPTIONS *options)
{ {
const char *id = options->p11engine ? options->p11engine : "pkcs11";
ENGINE *engine; ENGINE *engine;
if (options->p11engine) if (strchr(id, '.')) {
/* Treat strings with a dot as paths to dynamic engine modules */
engine = engine_dynamic(options); engine = engine_dynamic(options);
else } else {
engine = engine_pkcs11(); /* Treat strings without a dot as engine IDs */
engine = ENGINE_by_id(id);
if (!engine)
fprintf(stderr, "Failed to find and load '%s' engine\n", id);
}
if (!engine) if (!engine)
return 0; /* FAILED */ return 0; /* FAILED */
printf("Engine \"%s\" set.\n", ENGINE_get_id(engine)); printf("Engine \"%s\" set.\n", ENGINE_get_id(engine));