summaryrefslogtreecommitdiff
path: root/lib/libcrypto
diff options
context:
space:
mode:
Diffstat (limited to 'lib/libcrypto')
-rw-r--r--lib/libcrypto/Symbols.list1
-rw-r--r--lib/libcrypto/conf/conf.h3
-rw-r--r--lib/libcrypto/conf/conf_lib.c13
-rw-r--r--lib/libcrypto/hidden/openssl/conf.h3
4 files changed, 4 insertions, 16 deletions
diff --git a/lib/libcrypto/Symbols.list b/lib/libcrypto/Symbols.list
index 2b3fc45ba1f..396281c16c6 100644
--- a/lib/libcrypto/Symbols.list
+++ b/lib/libcrypto/Symbols.list
@@ -1488,7 +1488,6 @@ NAME_CONSTRAINTS_it
NAME_CONSTRAINTS_new
NCONF_default
NCONF_free
-NCONF_free_data
NCONF_get_number_e
NCONF_get_section
NCONF_get_string
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)
{
diff --git a/lib/libcrypto/hidden/openssl/conf.h b/lib/libcrypto/hidden/openssl/conf.h
index dc211d8968b..7374501c9c0 100644
--- a/lib/libcrypto/hidden/openssl/conf.h
+++ b/lib/libcrypto/hidden/openssl/conf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.h,v 1.4 2024/08/31 09:34:05 tb Exp $ */
+/* $OpenBSD: conf.h,v 1.5 2024/08/31 09:41:53 tb Exp $ */
/*
* Copyright (c) 2024 Bob Beck <beck@openbsd.org>
*
@@ -39,7 +39,6 @@ LCRYPTO_USED(OPENSSL_no_config);
LCRYPTO_USED(NCONF_new);
LCRYPTO_USED(NCONF_default);
LCRYPTO_USED(NCONF_free);
-LCRYPTO_USED(NCONF_free_data);
LCRYPTO_USED(NCONF_load);
LCRYPTO_USED(NCONF_load_bio);
LCRYPTO_USED(NCONF_get_section);