oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

hcrypto: dlclose(dso) at ENGINE finish time

Browse Source
This commit is contained in:
Nicolas Williams
2022-01-16 14:06:49 -06:00
parent febdcd4cbd
commit bb791ee52c
1 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
lib/hcrypto/engine.c
View File

@@ -44,15 +44,22 @@ struct hc_engine {
const RSA_METHOD *rsa; const RSA_METHOD *rsa;
const DH_METHOD *dh; const DH_METHOD *dh;
const RAND_METHOD *rand; const RAND_METHOD *rand;
void *dso_handle;
}; };
ENGINE * ENGINE *
ENGINE_new(void) ENGINE_new(void)
{ {
ENGINE *engine; ENGINE *engine;
engine = calloc(1, sizeof(*engine)); engine = calloc(1, sizeof(*engine));
if (engine == NULL)
return NULL;
engine->references = 1; engine->references = 1;
engine->destroy = 0;
engine->dh = 0;
engine->rand = 0;
engine->dso_handle = 0;
return engine; return engine;
} }
@@ -77,6 +84,8 @@ ENGINE_finish(ENGINE *engine)
free(engine->id); free(engine->id);
if(engine->destroy) if(engine->destroy)
(*engine->destroy)(engine); (*engine->destroy)(engine);
if (engine->dso_handle)
dlclose(engine->dso_handle);
memset(engine, 0, sizeof(*engine)); memset(engine, 0, sizeof(*engine));
engine->references = -1; engine->references = -1;
@@ -299,15 +308,17 @@ ENGINE_by_dso(const char *path, const char *id)
{ {
#ifdef HAVE_DLOPEN #ifdef HAVE_DLOPEN
ENGINE *engine; ENGINE *engine;
void *handle;
int ret; int ret;
engine = calloc(1, sizeof(*engine)); engine = calloc(1, sizeof(*engine));
if (engine == NULL) if (engine == NULL)
return NULL; return NULL;
engine->references = 0; /* ref will be added below */
handle = dlopen(path, RTLD_NOW | RTLD_LOCAL | RTLD_GROUP); engine->destroy = 0;
if (handle == NULL) { engine->dh = 0;
engine->rand = 0;
engine->dso_handle = dlopen(path, RTLD_NOW | RTLD_LOCAL | RTLD_GROUP);
if (engine->dso_handle == NULL) {
/* printf("error: %s\n", dlerror()); */ /* printf("error: %s\n", dlerror()); */
free(engine); free(engine);
return NULL; return NULL;
@@ -317,16 +328,16 @@ ENGINE_by_dso(const char *path, const char *id)
unsigned long version; unsigned long version;
openssl_v_check v_check; openssl_v_check v_check;
v_check = (openssl_v_check)dlsym(handle, "v_check"); v_check = (openssl_v_check)dlsym(engine->dso_handle, "v_check");
if (v_check == NULL) { if (v_check == NULL) {
dlclose(handle); dlclose(engine->dso_handle);
free(engine); free(engine);
return NULL; return NULL;
} }
version = (*v_check)(OPENSSL_DYNAMIC_VERSION); version = (*v_check)(OPENSSL_DYNAMIC_VERSION);
if (version == 0) { if (version == 0) {
dlclose(handle); dlclose(engine->dso_handle);
free(engine); free(engine);
return NULL; return NULL;
} }
@@ -335,21 +346,21 @@ ENGINE_by_dso(const char *path, const char *id)
{ {
openssl_bind_engine bind_engine; openssl_bind_engine bind_engine;
bind_engine = (openssl_bind_engine)dlsym(handle, "bind_engine"); bind_engine =
(openssl_bind_engine)dlsym(engine->dso_handle, "bind_engine");
if (bind_engine == NULL) { if (bind_engine == NULL) {
dlclose(handle); dlclose(engine->dso_handle);
free(engine); free(engine);
return NULL; return NULL;
} }
ret = (*bind_engine)(engine, id, NULL); /* XXX fix third arg */ ret = (*bind_engine)(engine, id, NULL); /* XXX fix third arg */
if (ret != 1) { if (ret != 1) {
dlclose(handle); dlclose(engine->dso_handle);
free(engine); free(engine);
return NULL; return NULL;
} }
} }
dlclose(handle);
ENGINE_up_ref(engine); ENGINE_up_ref(engine);