From 579f4735c8005460c653e011ebb67f4239151893 Mon Sep 17 00:00:00 2001 From: tb Date: Sat, 31 Aug 2024 09:53:02 +0000 Subject: [PATCH] Unexport CONF_set_nconf() This translation device from old to new conf guts will need to stay for a while. However, it's only needed internally. ok beck jsing --- lib/libcrypto/conf/conf.h | 4 +--- lib/libcrypto/conf/conf_local.h | 4 +++- lib/libcrypto/hidden/openssl/conf.h | 3 +-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/lib/libcrypto/conf/conf.h b/lib/libcrypto/conf/conf.h index 5796ee29acf..b7df24e0017 100644 --- a/lib/libcrypto/conf/conf.h +++ b/lib/libcrypto/conf/conf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.h,v 1.25 2024/08/31 09:50:52 tb Exp $ */ +/* $OpenBSD: conf.h,v 1.26 2024/08/31 09:53:02 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -104,8 +104,6 @@ typedef void conf_finish_func(CONF_IMODULE *md); #define CONF_MFLAGS_IGNORE_MISSING_FILE 0x10 #define CONF_MFLAGS_DEFAULT_SECTION 0x20 -void CONF_set_nconf(CONF *conf, LHASH_OF(CONF_VALUE) *hash); - void OPENSSL_config(const char *config_name); void OPENSSL_no_config(void); diff --git a/lib/libcrypto/conf/conf_local.h b/lib/libcrypto/conf/conf_local.h index 035f9578661..2933240c8e9 100644 --- a/lib/libcrypto/conf/conf_local.h +++ b/lib/libcrypto/conf/conf_local.h @@ -1,4 +1,4 @@ -/* $OpenBSD: conf_local.h,v 1.5 2024/08/31 09:44:00 tb Exp $ */ +/* $OpenBSD: conf_local.h,v 1.6 2024/08/31 09:53:02 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -92,6 +92,8 @@ void CONF_module_set_usr_data(CONF_MODULE *pmod, void *usr_data); int CONF_parse_list(const char *list, int sep, int nospc, int (*list_cb)(const char *elem, int len, void *usr), void *arg); +void CONF_set_nconf(CONF *conf, LHASH_OF(CONF_VALUE) *hash); + CONF_VALUE *_CONF_new_section(CONF *conf, const char *section); CONF_VALUE *_CONF_get_section(const CONF *conf, const char *section); STACK_OF(CONF_VALUE) *_CONF_get_section_values(const CONF *conf, diff --git a/lib/libcrypto/hidden/openssl/conf.h b/lib/libcrypto/hidden/openssl/conf.h index adb9b38548c..29b49e920d5 100644 --- a/lib/libcrypto/hidden/openssl/conf.h +++ b/lib/libcrypto/hidden/openssl/conf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.h,v 1.7 2024/08/31 09:50:52 tb Exp $ */ +/* $OpenBSD: conf.h,v 1.8 2024/08/31 09:53:02 tb Exp $ */ /* * Copyright (c) 2024 Bob Beck * @@ -25,7 +25,6 @@ #endif #include "crypto_namespace.h" -LCRYPTO_USED(CONF_set_nconf); LCRYPTO_USED(OPENSSL_config); LCRYPTO_USED(OPENSSL_no_config); LCRYPTO_USED(NCONF_new); -- 2.20.1