summaryrefslogtreecommitdiff
path: root/lib/libcrypto/conf
diff options
context:
space:
mode:
authorTheo Buehler <tb@cvs.openbsd.org>2024-08-31 09:41:54 +0000
committerTheo Buehler <tb@cvs.openbsd.org>2024-08-31 09:41:54 +0000
commit6833ef7bc669078359c1210ed433a917c9c5540c (patch)
tree8b7f0178d2fce15f57c4dc3f9decfa361e88ce69 /lib/libcrypto/conf
parente5b4fd24c8405aa023e4607d853c678694a77afb (diff)
Inline NCONF_free_data in its only user
ok beck jsing
Diffstat (limited to 'lib/libcrypto/conf')
-rw-r--r--lib/libcrypto/conf/conf.h3
-rw-r--r--lib/libcrypto/conf/conf_lib.c13
2 files changed, 3 insertions, 13 deletions
diff --git a/lib/libcrypto/conf/conf.h b/lib/libcrypto/conf/conf.h
index 7ddb33ccd43..ebffab1401a 100644
--- a/lib/libcrypto/conf/conf.h
+++ b/lib/libcrypto/conf/conf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.h,v 1.22 2024/08/31 09:39:31 tb Exp $ */
+/* $OpenBSD: conf.h,v 1.23 2024/08/31 09:41:53 tb Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@ -133,7 +133,6 @@ struct conf_st {
CONF *NCONF_new(const CONF_METHOD *meth);
const CONF_METHOD *NCONF_default(void);
void NCONF_free(CONF *conf);
-void NCONF_free_data(CONF *conf);
int NCONF_load(CONF *conf, const char *file, long *eline);
int NCONF_load_bio(CONF *conf, BIO *bp, long *eline);
diff --git a/lib/libcrypto/conf/conf_lib.c b/lib/libcrypto/conf/conf_lib.c
index d7a2870520a..4440cfe6fde 100644
--- a/lib/libcrypto/conf/conf_lib.c
+++ b/lib/libcrypto/conf/conf_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf_lib.c,v 1.22 2024/08/31 09:39:31 tb Exp $ */
+/* $OpenBSD: conf_lib.c,v 1.23 2024/08/31 09:41:53 tb Exp $ */
/* Written by Richard Levitte (richard@levitte.org) for the OpenSSL
* project 2000.
*/
@@ -191,7 +191,7 @@ CONF_free(LHASH_OF(CONF_VALUE) *conf)
CONF ctmp;
CONF_set_nconf(&ctmp, conf);
- NCONF_free_data(&ctmp);
+ ctmp.meth->destroy_data(&ctmp);
}
LCRYPTO_ALIAS(CONF_free);
@@ -228,15 +228,6 @@ NCONF_free(CONF *conf)
}
LCRYPTO_ALIAS(NCONF_free);
-void
-NCONF_free_data(CONF *conf)
-{
- if (conf == NULL)
- return;
- conf->meth->destroy_data(conf);
-}
-LCRYPTO_ALIAS(NCONF_free_data);
-
int
NCONF_load(CONF *conf, const char *file, long *eline)
{