summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortb <>2024-08-31 09:18:00 +0000
committertb <>2024-08-31 09:18:00 +0000
commit118051aad867c86fdfdd1e12985c74aceed9470f (patch)
tree08439682ae0357dcc698bee785d05e0a152d2e0b
parent9bcd94a09cac618808e1f47aff1c670fbdb6828d (diff)
downloadopenbsd-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
-rw-r--r--src/lib/libcrypto/Symbols.list4
-rw-r--r--src/lib/libcrypto/conf/conf.h6
-rw-r--r--src/lib/libcrypto/conf/conf_lib.c55
-rw-r--r--src/lib/libcrypto/hidden/openssl/conf.h6
4 files changed, 3 insertions, 68 deletions
diff --git a/src/lib/libcrypto/Symbols.list b/src/lib/libcrypto/Symbols.list
index 05c39eddbb..3385b631e7 100644
--- a/src/lib/libcrypto/Symbols.list
+++ b/src/lib/libcrypto/Symbols.list
@@ -589,8 +589,6 @@ CMS_unsigned_get_attr_by_OBJ
589CMS_unsigned_get_attr_count 589CMS_unsigned_get_attr_count
590CMS_verify 590CMS_verify
591CMS_verify_receipt 591CMS_verify_receipt
592CONF_dump_bio
593CONF_dump_fp
594CONF_free 592CONF_free
595CONF_get1_default_config_file 593CONF_get1_default_config_file
596CONF_get_number 594CONF_get_number
@@ -1505,8 +1503,6 @@ NAME_CONSTRAINTS_it
1505NAME_CONSTRAINTS_new 1503NAME_CONSTRAINTS_new
1506NCONF_WIN32 1504NCONF_WIN32
1507NCONF_default 1505NCONF_default
1508NCONF_dump_bio
1509NCONF_dump_fp
1510NCONF_free 1506NCONF_free
1511NCONF_free_data 1507NCONF_free_data
1512NCONF_get_number_e 1508NCONF_get_number_e
diff --git a/src/lib/libcrypto/conf/conf.h b/src/lib/libcrypto/conf/conf.h
index 5d10163bfb..7b30ad453d 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.16 2022/07/12 14:42:48 kn Exp $ */ 1/* $OpenBSD: conf.h,v 1.17 2024/08/31 09:18:00 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 *
@@ -131,8 +131,6 @@ char *CONF_get_string(LHASH_OF(CONF_VALUE) *conf, const char *group,
131long CONF_get_number(LHASH_OF(CONF_VALUE) *conf, const char *group, 131long CONF_get_number(LHASH_OF(CONF_VALUE) *conf, const char *group,
132 const char *name); 132 const char *name);
133void CONF_free(LHASH_OF(CONF_VALUE) *conf); 133void CONF_free(LHASH_OF(CONF_VALUE) *conf);
134int CONF_dump_fp(LHASH_OF(CONF_VALUE) *conf, FILE *out);
135int CONF_dump_bio(LHASH_OF(CONF_VALUE) *conf, BIO *out);
136 134
137void OPENSSL_config(const char *config_name); 135void OPENSSL_config(const char *config_name);
138void OPENSSL_no_config(void); 136void OPENSSL_no_config(void);
@@ -159,8 +157,6 @@ STACK_OF(CONF_VALUE) *NCONF_get_section(const CONF *conf, const char *section);
159char *NCONF_get_string(const CONF *conf, const char *group, const char *name); 157char *NCONF_get_string(const CONF *conf, const char *group, const char *name);
160int NCONF_get_number_e(const CONF *conf, const char *group, const char *name, 158int NCONF_get_number_e(const CONF *conf, const char *group, const char *name,
161 long *result); 159 long *result);
162int NCONF_dump_fp(const CONF *conf, FILE *out);
163int NCONF_dump_bio(const CONF *conf, BIO *out);
164 160
165#define NCONF_get_number(c,g,n,r) NCONF_get_number_e(c,g,n,r) 161#define NCONF_get_number(c,g,n,r) NCONF_get_number_e(c,g,n,r)
166 162
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}
199LCRYPTO_ALIAS(CONF_free); 199LCRYPTO_ALIAS(CONF_free);
200 200
201int
202CONF_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}
215LCRYPTO_ALIAS(CONF_dump_fp);
216
217int
218CONF_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}
225LCRYPTO_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}
370LCRYPTO_ALIAS(NCONF_get_number_e); 344LCRYPTO_ALIAS(NCONF_get_number_e);
371
372int
373NCONF_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}
385LCRYPTO_ALIAS(NCONF_dump_fp);
386
387int
388NCONF_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}
397LCRYPTO_ALIAS(NCONF_dump_bio);
diff --git a/src/lib/libcrypto/hidden/openssl/conf.h b/src/lib/libcrypto/hidden/openssl/conf.h
index 9408a543e3..9d073303ca 100644
--- a/src/lib/libcrypto/hidden/openssl/conf.h
+++ b/src/lib/libcrypto/hidden/openssl/conf.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: conf.h,v 1.1 2024/04/09 14:57:28 tb Exp $ */ 1/* $OpenBSD: conf.h,v 1.2 2024/08/31 09:18:00 tb Exp $ */
2/* 2/*
3 * Copyright (c) 2024 Bob Beck <beck@openbsd.org> 3 * Copyright (c) 2024 Bob Beck <beck@openbsd.org>
4 * 4 *
@@ -34,8 +34,6 @@ LCRYPTO_USED(CONF_get_section);
34LCRYPTO_USED(CONF_get_string); 34LCRYPTO_USED(CONF_get_string);
35LCRYPTO_USED(CONF_get_number); 35LCRYPTO_USED(CONF_get_number);
36LCRYPTO_USED(CONF_free); 36LCRYPTO_USED(CONF_free);
37LCRYPTO_USED(CONF_dump_fp);
38LCRYPTO_USED(CONF_dump_bio);
39LCRYPTO_USED(OPENSSL_config); 37LCRYPTO_USED(OPENSSL_config);
40LCRYPTO_USED(OPENSSL_no_config); 38LCRYPTO_USED(OPENSSL_no_config);
41LCRYPTO_USED(NCONF_new); 39LCRYPTO_USED(NCONF_new);
@@ -49,8 +47,6 @@ LCRYPTO_USED(NCONF_load_bio);
49LCRYPTO_USED(NCONF_get_section); 47LCRYPTO_USED(NCONF_get_section);
50LCRYPTO_USED(NCONF_get_string); 48LCRYPTO_USED(NCONF_get_string);
51LCRYPTO_USED(NCONF_get_number_e); 49LCRYPTO_USED(NCONF_get_number_e);
52LCRYPTO_USED(NCONF_dump_fp);
53LCRYPTO_USED(NCONF_dump_bio);
54LCRYPTO_USED(CONF_modules_load); 50LCRYPTO_USED(CONF_modules_load);
55LCRYPTO_USED(CONF_modules_load_file); 51LCRYPTO_USED(CONF_modules_load_file);
56LCRYPTO_USED(CONF_modules_unload); 52LCRYPTO_USED(CONF_modules_unload);
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-21 17:35:08 +0000