summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortb <>2024-03-20 21:49:00 +0000
committertb <>2024-03-20 21:49:00 +0000
commitbd3d731c7effabc137ffb6978a78fb4201969e03 (patch)
treefc76b0f47443726b6da3140d77549592a353a25f /src
parent0de7995140535d5315629d4c1bb9008cd635b390 (diff)
downloadopenbsd-bd3d731c7effabc137ffb6978a78fb4201969e03.tar.gz
openbsd-bd3d731c7effabc137ffb6978a78fb4201969e03.tar.bz2
openbsd-bd3d731c7effabc137ffb6978a78fb4201969e03.zip
md -> mod for CONF_MODULEs
A CONF_MODULE is no EVP_MD, so call it mod instead of md.
Diffstat (limited to 'src')
-rw-r--r--src/lib/libcrypto/conf/conf_mod.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/lib/libcrypto/conf/conf_mod.c b/src/lib/libcrypto/conf/conf_mod.c
index a919a54f20..a7db5075b0 100644
--- a/src/lib/libcrypto/conf/conf_mod.c
+++ b/src/lib/libcrypto/conf/conf_mod.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: conf_mod.c,v 1.31 2024/03/20 21:41:09 tb Exp $ */ 1/* $OpenBSD: conf_mod.c,v 1.32 2024/03/20 21:49:00 tb Exp $ */
2/* Written by Stephen Henson (steve@openssl.org) for the OpenSSL 2/* Written by Stephen Henson (steve@openssl.org) for the OpenSSL
3 * project 2001. 3 * project 2001.
4 */ 4 */
@@ -96,7 +96,7 @@ struct conf_imodule_st {
96static STACK_OF(CONF_MODULE) *supported_modules = NULL; 96static STACK_OF(CONF_MODULE) *supported_modules = NULL;
97static STACK_OF(CONF_IMODULE) *initialized_modules = NULL; 97static STACK_OF(CONF_IMODULE) *initialized_modules = NULL;
98 98
99static void module_free(CONF_MODULE *md); 99static void module_free(CONF_MODULE *mod);
100static void imodule_free(CONF_IMODULE *imod); 100static void imodule_free(CONF_IMODULE *imod);
101static void module_finish(CONF_IMODULE *imod); 101static void module_finish(CONF_IMODULE *imod);
102static int module_run(const CONF *cnf, char *name, char *value, 102static int module_run(const CONF *cnf, char *name, char *value,
@@ -189,10 +189,10 @@ err:
189static int 189static int
190module_run(const CONF *cnf, char *name, char *value, unsigned long flags) 190module_run(const CONF *cnf, char *name, char *value, unsigned long flags)
191{ 191{
192 CONF_MODULE *md; 192 CONF_MODULE *mod;
193 int ret; 193 int ret;
194 194
195 if ((md = module_find(name)) == NULL) { 195 if ((mod = module_find(name)) == NULL) {
196 if (!(flags & CONF_MFLAGS_SILENT)) { 196 if (!(flags & CONF_MFLAGS_SILENT)) {
197 CONFerror(CONF_R_UNKNOWN_MODULE_NAME); 197 CONFerror(CONF_R_UNKNOWN_MODULE_NAME);
198 ERR_asprintf_error_data("module=%s", name); 198 ERR_asprintf_error_data("module=%s", name);
@@ -200,7 +200,7 @@ module_run(const CONF *cnf, char *name, char *value, unsigned long flags)
200 return -1; 200 return -1;
201 } 201 }
202 202
203 ret = module_init(md, name, value, cnf); 203 ret = module_init(mod, name, value, cnf);
204 204
205 if (ret <= 0) { 205 if (ret <= 0) {
206 if (!(flags & CONF_MFLAGS_SILENT)) { 206 if (!(flags & CONF_MFLAGS_SILENT)) {
@@ -346,18 +346,18 @@ void
346CONF_modules_unload(int all) 346CONF_modules_unload(int all)
347{ 347{
348 int i; 348 int i;
349 CONF_MODULE *md; 349 CONF_MODULE *mod;
350 350
351 CONF_modules_finish(); 351 CONF_modules_finish();
352 352
353 /* unload modules in reverse order */ 353 /* unload modules in reverse order */
354 for (i = sk_CONF_MODULE_num(supported_modules) - 1; i >= 0; i--) { 354 for (i = sk_CONF_MODULE_num(supported_modules) - 1; i >= 0; i--) {
355 md = sk_CONF_MODULE_value(supported_modules, i); 355 mod = sk_CONF_MODULE_value(supported_modules, i);
356 if (!all) 356 if (!all)
357 continue; 357 continue;
358 /* Since we're working in reverse this is OK */ 358 /* Since we're working in reverse this is OK */
359 (void)sk_CONF_MODULE_delete(supported_modules, i); 359 (void)sk_CONF_MODULE_delete(supported_modules, i);
360 module_free(md); 360 module_free(mod);
361 } 361 }
362 if (sk_CONF_MODULE_num(supported_modules) == 0) { 362 if (sk_CONF_MODULE_num(supported_modules) == 0) {
363 sk_CONF_MODULE_free(supported_modules); 363 sk_CONF_MODULE_free(supported_modules);
@@ -367,13 +367,13 @@ CONF_modules_unload(int all)
367 367
368/* unload a single module */ 368/* unload a single module */
369static void 369static void
370module_free(CONF_MODULE *md) 370module_free(CONF_MODULE *mod)
371{ 371{
372 if (md == NULL) 372 if (mod == NULL)
373 return; 373 return;
374 374
375 free(md->name); 375 free(mod->name);
376 free(md); 376 free(mod);
377} 377}
378 378
379static void 379static void