From 465ca291ecb667ff9b02fa56937b3f5ee1ae84cd Mon Sep 17 00:00:00 2001 From: tb <> Date: Sat, 31 Aug 2024 09:26:18 +0000 Subject: Unexport some conf layers unused outside of libcrypto imodules are called imodules because they contain Information about modules that have been Initialized. Which one of these two I it is is anyone's best guess. Why anything outside of libcrypto would ever possibly care will also remain a mystery. Remove the old way of adding a conf module, user data, stop allowing to set a method (it's opaque now, remember?) and drop a couple bits more from the public api interface. ok beck jsing --- src/lib/libcrypto/conf/conf.h | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) (limited to 'src/lib/libcrypto/conf/conf.h') diff --git a/src/lib/libcrypto/conf/conf.h b/src/lib/libcrypto/conf/conf.h index 5129a259b3..feccaafb05 100644 --- a/src/lib/libcrypto/conf/conf.h +++ b/src/lib/libcrypto/conf/conf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.h,v 1.18 2024/08/31 09:21:44 tb Exp $ */ +/* $OpenBSD: conf.h,v 1.19 2024/08/31 09:26:18 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -138,7 +138,6 @@ void NCONF_free(CONF *conf); void NCONF_free_data(CONF *conf); int NCONF_load(CONF *conf, const char *file, long *eline); -int NCONF_load_fp(CONF *conf, FILE *fp, long *eline); int NCONF_load_bio(CONF *conf, BIO *bp, long *eline); STACK_OF(CONF_VALUE) *NCONF_get_section(const CONF *conf, const char *section); char *NCONF_get_string(const CONF *conf, const char *group, const char *name); @@ -156,24 +155,9 @@ int CONF_modules_load_file(const char *filename, const char *appname, void CONF_modules_unload(int all); void CONF_modules_finish(void); void CONF_modules_free(void); -int CONF_module_add(const char *name, conf_init_func *ifunc, - conf_finish_func *ffunc); - -const char *CONF_imodule_get_name(const CONF_IMODULE *md); -const char *CONF_imodule_get_value(const CONF_IMODULE *md); -void *CONF_imodule_get_usr_data(const CONF_IMODULE *md); -void CONF_imodule_set_usr_data(CONF_IMODULE *md, void *usr_data); -CONF_MODULE *CONF_imodule_get_module(const CONF_IMODULE *md); -unsigned long CONF_imodule_get_flags(const CONF_IMODULE *md); -void CONF_imodule_set_flags(CONF_IMODULE *md, unsigned long flags); -void *CONF_module_get_usr_data(CONF_MODULE *pmod); -void CONF_module_set_usr_data(CONF_MODULE *pmod, void *usr_data); char *CONF_get1_default_config_file(void); -int CONF_parse_list(const char *list, int sep, int nospc, - int (*list_cb)(const char *elem, int len, void *usr), void *arg); - void OPENSSL_load_builtin_modules(void); void ERR_load_CONF_strings(void); -- cgit v1.2.3-55-g6feb