summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/conf/conf_lib.c
diff options
context:
space:
mode:
authortb <>2024-08-31 09:41:53 +0000
committertb <>2024-08-31 09:41:53 +0000
commitfc84d1fea737eb16413bd12216cd96db95b290c2 (patch)
tree82c3879fada8ce2c25df980e1148e005da030c06 /src/lib/libcrypto/conf/conf_lib.c
parent3f796b469989d0e93492a6cb12d24e49b3a58dfd (diff)
downloadopenbsd-fc84d1fea737eb16413bd12216cd96db95b290c2.tar.gz
openbsd-fc84d1fea737eb16413bd12216cd96db95b290c2.tar.bz2
openbsd-fc84d1fea737eb16413bd12216cd96db95b290c2.zip
Inline NCONF_free_data in its only user
ok beck jsing
Diffstat (limited to 'src/lib/libcrypto/conf/conf_lib.c')
-rw-r--r--src/lib/libcrypto/conf/conf_lib.c13
1 files changed, 2 insertions, 11 deletions
diff --git a/src/lib/libcrypto/conf/conf_lib.c b/src/lib/libcrypto/conf/conf_lib.c
index d7a2870520..4440cfe6fd 100644
--- a/src/lib/libcrypto/conf/conf_lib.c
+++ b/src/lib/libcrypto/conf/conf_lib.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: conf_lib.c,v 1.22 2024/08/31 09:39:31 tb Exp $ */ 1/* $OpenBSD: conf_lib.c,v 1.23 2024/08/31 09:41:53 tb Exp $ */
2/* Written by Richard Levitte (richard@levitte.org) for the OpenSSL 2/* Written by Richard Levitte (richard@levitte.org) for the OpenSSL
3 * project 2000. 3 * project 2000.
4 */ 4 */
@@ -191,7 +191,7 @@ CONF_free(LHASH_OF(CONF_VALUE) *conf)
191 CONF ctmp; 191 CONF ctmp;
192 192
193 CONF_set_nconf(&ctmp, conf); 193 CONF_set_nconf(&ctmp, conf);
194 NCONF_free_data(&ctmp); 194 ctmp.meth->destroy_data(&ctmp);
195} 195}
196LCRYPTO_ALIAS(CONF_free); 196LCRYPTO_ALIAS(CONF_free);
197 197
@@ -228,15 +228,6 @@ NCONF_free(CONF *conf)
228} 228}
229LCRYPTO_ALIAS(NCONF_free); 229LCRYPTO_ALIAS(NCONF_free);
230 230
231void
232NCONF_free_data(CONF *conf)
233{
234 if (conf == NULL)
235 return;
236 conf->meth->destroy_data(conf);
237}
238LCRYPTO_ALIAS(NCONF_free_data);
239
240int 231int
241NCONF_load(CONF *conf, const char *file, long *eline) 232NCONF_load(CONF *conf, const char *file, long *eline)
242{ 233{