diff options
author | tb <> | 2024-08-31 09:18:00 +0000 |
---|---|---|
committer | tb <> | 2024-08-31 09:18:00 +0000 |
commit | 118051aad867c86fdfdd1e12985c74aceed9470f (patch) | |
tree | 08439682ae0357dcc698bee785d05e0a152d2e0b /src/lib/libcrypto/conf/conf_lib.c | |
parent | 9bcd94a09cac618808e1f47aff1c670fbdb6828d (diff) | |
download | openbsd-118051aad867c86fdfdd1e12985c74aceed9470f.tar.gz openbsd-118051aad867c86fdfdd1e12985c74aceed9470f.tar.bz2 openbsd-118051aad867c86fdfdd1e12985c74aceed9470f.zip |
Remove unused {,N}CONF_dump_{bio,fp}()
It's time to start removing some horrors from the conf/ garbage. If the
current top layer wasn't terrible enough, you could always slap another
one on top of it and it would then be truly marvellous.
ok beck jsing
Diffstat (limited to 'src/lib/libcrypto/conf/conf_lib.c')
-rw-r--r-- | src/lib/libcrypto/conf/conf_lib.c | 55 |
1 files changed, 1 insertions, 54 deletions
diff --git a/src/lib/libcrypto/conf/conf_lib.c b/src/lib/libcrypto/conf/conf_lib.c index d1c85dc098..01735906c0 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.17 2024/04/09 13:56:30 beck Exp $ */ | 1 | /* $OpenBSD: conf_lib.c,v 1.18 2024/08/31 09:18:00 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 | */ |
@@ -198,32 +198,6 @@ CONF_free(LHASH_OF(CONF_VALUE) *conf) | |||
198 | } | 198 | } |
199 | LCRYPTO_ALIAS(CONF_free); | 199 | LCRYPTO_ALIAS(CONF_free); |
200 | 200 | ||
201 | int | ||
202 | CONF_dump_fp(LHASH_OF(CONF_VALUE) *conf, FILE *out) | ||
203 | { | ||
204 | BIO *btmp; | ||
205 | int ret; | ||
206 | |||
207 | if (!(btmp = BIO_new_fp(out, BIO_NOCLOSE))) { | ||
208 | CONFerror(ERR_R_BUF_LIB); | ||
209 | return 0; | ||
210 | } | ||
211 | ret = CONF_dump_bio(conf, btmp); | ||
212 | BIO_free(btmp); | ||
213 | return ret; | ||
214 | } | ||
215 | LCRYPTO_ALIAS(CONF_dump_fp); | ||
216 | |||
217 | int | ||
218 | CONF_dump_bio(LHASH_OF(CONF_VALUE) *conf, BIO *out) | ||
219 | { | ||
220 | CONF ctmp; | ||
221 | |||
222 | CONF_set_nconf(&ctmp, conf); | ||
223 | return NCONF_dump_bio(&ctmp, out); | ||
224 | } | ||
225 | LCRYPTO_ALIAS(CONF_dump_bio); | ||
226 | |||
227 | /* The following section contains the "New CONF" functions. They are | 201 | /* The following section contains the "New CONF" functions. They are |
228 | completely centralised around a new CONF structure that may contain | 202 | completely centralised around a new CONF structure that may contain |
229 | basically anything, but at least a method pointer and a table of data. | 203 | basically anything, but at least a method pointer and a table of data. |
@@ -368,30 +342,3 @@ NCONF_get_number_e(const CONF *conf, const char *group, const char *name, | |||
368 | return 1; | 342 | return 1; |
369 | } | 343 | } |
370 | LCRYPTO_ALIAS(NCONF_get_number_e); | 344 | LCRYPTO_ALIAS(NCONF_get_number_e); |
371 | |||
372 | int | ||
373 | NCONF_dump_fp(const CONF *conf, FILE *out) | ||
374 | { | ||
375 | BIO *btmp; | ||
376 | int ret; | ||
377 | if (!(btmp = BIO_new_fp(out, BIO_NOCLOSE))) { | ||
378 | CONFerror(ERR_R_BUF_LIB); | ||
379 | return 0; | ||
380 | } | ||
381 | ret = NCONF_dump_bio(conf, btmp); | ||
382 | BIO_free(btmp); | ||
383 | return ret; | ||
384 | } | ||
385 | LCRYPTO_ALIAS(NCONF_dump_fp); | ||
386 | |||
387 | int | ||
388 | NCONF_dump_bio(const CONF *conf, BIO *out) | ||
389 | { | ||
390 | if (conf == NULL) { | ||
391 | CONFerror(CONF_R_NO_CONF); | ||
392 | return 0; | ||
393 | } | ||
394 | |||
395 | return conf->meth->dump(conf, out); | ||
396 | } | ||
397 | LCRYPTO_ALIAS(NCONF_dump_bio); | ||