diff options
Diffstat (limited to '')
-rw-r--r-- | src/lib/libcrypto/conf/conf_lib.c | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/src/lib/libcrypto/conf/conf_lib.c b/src/lib/libcrypto/conf/conf_lib.c index fca7486de3..abeea5588f 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.19 2024/08/31 09:21:44 tb Exp $ */ | 1 | /* $OpenBSD: conf_lib.c,v 1.20 2024/08/31 09:26:18 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 | */ |
@@ -77,7 +77,6 @@ CONF_set_nconf(CONF *conf, LHASH_OF(CONF_VALUE) *hash) | |||
77 | default_CONF_method->init(conf); | 77 | default_CONF_method->init(conf); |
78 | conf->data = hash; | 78 | conf->data = hash; |
79 | } | 79 | } |
80 | LCRYPTO_ALIAS(CONF_set_nconf); | ||
81 | 80 | ||
82 | /* The following section contains the "CONF classic" functions, | 81 | /* The following section contains the "CONF classic" functions, |
83 | rewritten in terms of the new CONF interface. */ | 82 | rewritten in terms of the new CONF interface. */ |
@@ -88,7 +87,6 @@ CONF_set_default_method(CONF_METHOD *meth) | |||
88 | default_CONF_method = meth; | 87 | default_CONF_method = meth; |
89 | return 1; | 88 | return 1; |
90 | } | 89 | } |
91 | LCRYPTO_ALIAS(CONF_set_default_method); | ||
92 | 90 | ||
93 | LHASH_OF(CONF_VALUE) * | 91 | LHASH_OF(CONF_VALUE) * |
94 | CONF_load(LHASH_OF(CONF_VALUE) *conf, const char *file, long *eline) | 92 | CONF_load(LHASH_OF(CONF_VALUE) *conf, const char *file, long *eline) |
@@ -123,7 +121,6 @@ CONF_load_fp(LHASH_OF(CONF_VALUE) *conf, FILE *fp, long *eline) | |||
123 | BIO_free(btmp); | 121 | BIO_free(btmp); |
124 | return ltmp; | 122 | return ltmp; |
125 | } | 123 | } |
126 | LCRYPTO_ALIAS(CONF_load_fp); | ||
127 | 124 | ||
128 | LHASH_OF(CONF_VALUE) * | 125 | LHASH_OF(CONF_VALUE) * |
129 | CONF_load_bio(LHASH_OF(CONF_VALUE) *conf, BIO *bp, long *eline) | 126 | CONF_load_bio(LHASH_OF(CONF_VALUE) *conf, BIO *bp, long *eline) |
@@ -138,7 +135,6 @@ CONF_load_bio(LHASH_OF(CONF_VALUE) *conf, BIO *bp, long *eline) | |||
138 | return ctmp.data; | 135 | return ctmp.data; |
139 | return NULL; | 136 | return NULL; |
140 | } | 137 | } |
141 | LCRYPTO_ALIAS(CONF_load_bio); | ||
142 | 138 | ||
143 | STACK_OF(CONF_VALUE) * | 139 | STACK_OF(CONF_VALUE) * |
144 | CONF_get_section(LHASH_OF(CONF_VALUE) *conf, const char *section) | 140 | CONF_get_section(LHASH_OF(CONF_VALUE) *conf, const char *section) |
@@ -255,22 +251,6 @@ NCONF_load(CONF *conf, const char *file, long *eline) | |||
255 | LCRYPTO_ALIAS(NCONF_load); | 251 | LCRYPTO_ALIAS(NCONF_load); |
256 | 252 | ||
257 | int | 253 | int |
258 | NCONF_load_fp(CONF *conf, FILE *fp, long *eline) | ||
259 | { | ||
260 | BIO *btmp; | ||
261 | int ret; | ||
262 | |||
263 | if (!(btmp = BIO_new_fp(fp, BIO_NOCLOSE))) { | ||
264 | CONFerror(ERR_R_BUF_LIB); | ||
265 | return 0; | ||
266 | } | ||
267 | ret = NCONF_load_bio(conf, btmp, eline); | ||
268 | BIO_free(btmp); | ||
269 | return ret; | ||
270 | } | ||
271 | LCRYPTO_ALIAS(NCONF_load_fp); | ||
272 | |||
273 | int | ||
274 | NCONF_load_bio(CONF *conf, BIO *bp, long *eline) | 254 | NCONF_load_bio(CONF *conf, BIO *bp, long *eline) |
275 | { | 255 | { |
276 | if (conf == NULL) { | 256 | if (conf == NULL) { |