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

Discover engine ID if full path was specified

Browse Source 
Fix #180
This commit is contained in:
Michał Trojnara 2023-01-19 11:58:52 +01:00
parent bb6322e378
commit 506daf84ac
1 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
osslsigncode.c
View File

@ -5344,21 +5344,41 @@ static int read_pvk_key(GLOBAL_OPTIONS *options, CRYPTO_PARAMS *cparams)
/* Load an engine in a shareable library */ /* Load an engine in a shareable library */
static ENGINE *dynamic_engine(GLOBAL_OPTIONS *options) static ENGINE *dynamic_engine(GLOBAL_OPTIONS *options)
{ {
ENGINE *engine = ENGINE_by_id("dynamic"); ENGINE *engine;
char *id;
engine = ENGINE_by_id("dynamic");
if (!engine) { if (!engine) {
printf("Failed to load 'dynamic' engine\n"); printf("Failed to load 'dynamic' engine\n");
return NULL; /* FAILED */ return NULL; /* FAILED */
} }
if (options->p11engine) { /* strip directory and extension */
char *ptr;
ptr = strrchr(options->p11engine, '/');
if (!ptr) /* no slash -> try backslash */
ptr = strrchr(options->p11engine, '\\');
if (ptr) /* directory separator found */
ptr++; /* skip it */
else /* directory separator not found */
ptr = options->p11engine;
id = OPENSSL_strdup(ptr);
ptr = strchr(id, '.');
if (ptr) /* file extensions found */
*ptr = '\0'; /* remove them */
} else {
id = OPENSSL_strdup("pkcs11");
}
if (!ENGINE_ctrl_cmd_string(engine, "SO_PATH", options->p11engine, 0) if (!ENGINE_ctrl_cmd_string(engine, "SO_PATH", options->p11engine, 0)
|| !ENGINE_ctrl_cmd_string(engine, "ID", || !ENGINE_ctrl_cmd_string(engine, "ID", id, 0)
options->p11engine ? options->p11engine : "pkcs11", 0)
|| !ENGINE_ctrl_cmd_string(engine, "LIST_ADD", "1", 0) || !ENGINE_ctrl_cmd_string(engine, "LIST_ADD", "1", 0)
|| !ENGINE_ctrl_cmd_string(engine, "LOAD", NULL, 0)) { || !ENGINE_ctrl_cmd_string(engine, "LOAD", NULL, 0)) {
printf("Failed to set 'dynamic' engine\n"); printf("Failed to set 'dynamic' engine\n");
ENGINE_free(engine); ENGINE_free(engine);
return NULL; /* FAILED */ engine = NULL; /* FAILED */
} }
return engine; /* OK */ OPENSSL_free(id);
return engine;
} }
/* Load a pkcs11 engine */ /* Load a pkcs11 engine */