mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-03 16:15:27 +00:00
Code Issues Releases Wiki Activity

Rename the global ENGINE *e to global_engine

Browse Source
This commit is contained in:
Timo Teräs
2022-12-26 19:17:19 +02:00
committed by Ondřej Surý
parent 11692467cd
commit 9e417f9815
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
lib/dns/openssl_link.c
View File

@@ -48,7 +48,7 @@
#include "openssl_shim.h" #include "openssl_shim.h"
#if !defined(OPENSSL_NO_ENGINE) && OPENSSL_API_LEVEL < 30000 #if !defined(OPENSSL_NO_ENGINE) && OPENSSL_API_LEVEL < 30000
static ENGINE *e = NULL; static ENGINE *global_engine = NULL;
#endif /* if !defined(OPENSSL_NO_ENGINE) && OPENSSL_API_LEVEL < 30000 */ #endif /* if !defined(OPENSSL_NO_ENGINE) && OPENSSL_API_LEVEL < 30000 */
static void static void
@@ -80,17 +80,17 @@ dst__openssl_init(const char *engine) {
} }
if (engine != NULL) { if (engine != NULL) {
e = ENGINE_by_id(engine); global_engine = ENGINE_by_id(engine);
if (e == NULL) { if (global_engine == NULL) {
result = DST_R_NOENGINE; result = DST_R_NOENGINE;
goto cleanup_rm; goto cleanup_rm;
} }
if (!ENGINE_init(e)) { if (!ENGINE_init(global_engine)) {
result = DST_R_NOENGINE; result = DST_R_NOENGINE;
goto cleanup_rm; goto cleanup_rm;
} }
/* This will init the engine. */ /* This will init the engine. */
if (!ENGINE_set_default(e, ENGINE_METHOD_ALL)) { if (!ENGINE_set_default(global_engine, ENGINE_METHOD_ALL)) {
result = DST_R_NOENGINE; result = DST_R_NOENGINE;
goto cleanup_init; goto cleanup_init;
} }
@@ -98,12 +98,12 @@ dst__openssl_init(const char *engine) {
return (ISC_R_SUCCESS); return (ISC_R_SUCCESS);
cleanup_init: cleanup_init:
ENGINE_finish(e); ENGINE_finish(global_engine);
cleanup_rm: cleanup_rm:
if (e != NULL) { if (global_engine != NULL) {
ENGINE_free(e); ENGINE_free(global_engine);
} }
e = NULL; global_engine = NULL;
#else #else
UNUSED(engine); UNUSED(engine);
#endif /* if !defined(OPENSSL_NO_ENGINE) && OPENSSL_API_LEVEL < 30000 */ #endif /* if !defined(OPENSSL_NO_ENGINE) && OPENSSL_API_LEVEL < 30000 */
@@ -113,11 +113,11 @@ cleanup_rm:
void void
dst__openssl_destroy(void) { dst__openssl_destroy(void) {
#if !defined(OPENSSL_NO_ENGINE) && OPENSSL_API_LEVEL < 30000 #if !defined(OPENSSL_NO_ENGINE) && OPENSSL_API_LEVEL < 30000
if (e != NULL) { if (global_engine != NULL) {
ENGINE_finish(e); ENGINE_finish(global_engine);
ENGINE_free(e); ENGINE_free(global_engine);
} }
e = NULL; global_engine = NULL;
#endif /* if !defined(OPENSSL_NO_ENGINE) && OPENSSL_API_LEVEL < 30000 */ #endif /* if !defined(OPENSSL_NO_ENGINE) && OPENSSL_API_LEVEL < 30000 */
} }
@@ -209,11 +209,11 @@ dst__openssl_getengine(const char *engine) {
if (engine == NULL) { if (engine == NULL) {
return (NULL); return (NULL);
} }
if (e == NULL) { if (global_engine == NULL) {
return (NULL); return (NULL);
} }
if (strcmp(engine, ENGINE_get_id(e)) == 0) { if (strcmp(engine, ENGINE_get_id(global_engine)) == 0) {
return (e); return (global_engine);
} }
return (NULL); return (NULL);
} }