diff options
| author | tb <> | 2024-08-31 09:26:18 +0000 |
|---|---|---|
| committer | tb <> | 2024-08-31 09:26:18 +0000 |
| commit | fa06106840d12417b65b1d797ece2e162f6ca2f7 (patch) | |
| tree | 2d0e6a77bd6951db3389273540c9f34d62df1eb7 /src/lib/libcrypto/conf/conf.h | |
| parent | e47979e7652d27e7b364efb7a46ac39336b4cf87 (diff) | |
| download | openbsd-fa06106840d12417b65b1d797ece2e162f6ca2f7.tar.gz openbsd-fa06106840d12417b65b1d797ece2e162f6ca2f7.tar.bz2 openbsd-fa06106840d12417b65b1d797ece2e162f6ca2f7.zip | |
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
Diffstat (limited to 'src/lib/libcrypto/conf/conf.h')
| -rw-r--r-- | src/lib/libcrypto/conf/conf.h | 18 |
1 files changed, 1 insertions, 17 deletions
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 @@ | |||
| 1 | /* $OpenBSD: conf.h,v 1.18 2024/08/31 09:21:44 tb Exp $ */ | 1 | /* $OpenBSD: conf.h,v 1.19 2024/08/31 09:26:18 tb Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -138,7 +138,6 @@ void NCONF_free(CONF *conf); | |||
| 138 | void NCONF_free_data(CONF *conf); | 138 | void NCONF_free_data(CONF *conf); |
| 139 | 139 | ||
| 140 | int NCONF_load(CONF *conf, const char *file, long *eline); | 140 | int NCONF_load(CONF *conf, const char *file, long *eline); |
| 141 | int NCONF_load_fp(CONF *conf, FILE *fp, long *eline); | ||
| 142 | int NCONF_load_bio(CONF *conf, BIO *bp, long *eline); | 141 | int NCONF_load_bio(CONF *conf, BIO *bp, long *eline); |
| 143 | STACK_OF(CONF_VALUE) *NCONF_get_section(const CONF *conf, const char *section); | 142 | STACK_OF(CONF_VALUE) *NCONF_get_section(const CONF *conf, const char *section); |
| 144 | char *NCONF_get_string(const CONF *conf, const char *group, const char *name); | 143 | 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, | |||
| 156 | void CONF_modules_unload(int all); | 155 | void CONF_modules_unload(int all); |
| 157 | void CONF_modules_finish(void); | 156 | void CONF_modules_finish(void); |
| 158 | void CONF_modules_free(void); | 157 | void CONF_modules_free(void); |
| 159 | int CONF_module_add(const char *name, conf_init_func *ifunc, | ||
| 160 | conf_finish_func *ffunc); | ||
| 161 | |||
| 162 | const char *CONF_imodule_get_name(const CONF_IMODULE *md); | ||
| 163 | const char *CONF_imodule_get_value(const CONF_IMODULE *md); | ||
| 164 | void *CONF_imodule_get_usr_data(const CONF_IMODULE *md); | ||
| 165 | void CONF_imodule_set_usr_data(CONF_IMODULE *md, void *usr_data); | ||
| 166 | CONF_MODULE *CONF_imodule_get_module(const CONF_IMODULE *md); | ||
| 167 | unsigned long CONF_imodule_get_flags(const CONF_IMODULE *md); | ||
| 168 | void CONF_imodule_set_flags(CONF_IMODULE *md, unsigned long flags); | ||
| 169 | void *CONF_module_get_usr_data(CONF_MODULE *pmod); | ||
| 170 | void CONF_module_set_usr_data(CONF_MODULE *pmod, void *usr_data); | ||
| 171 | 158 | ||
| 172 | char *CONF_get1_default_config_file(void); | 159 | char *CONF_get1_default_config_file(void); |
| 173 | 160 | ||
| 174 | int CONF_parse_list(const char *list, int sep, int nospc, | ||
| 175 | int (*list_cb)(const char *elem, int len, void *usr), void *arg); | ||
| 176 | |||
| 177 | void OPENSSL_load_builtin_modules(void); | 161 | void OPENSSL_load_builtin_modules(void); |
| 178 | 162 | ||
| 179 | void ERR_load_CONF_strings(void); | 163 | void ERR_load_CONF_strings(void); |
