Remove more CONF_* functions that are no longer needed

This is the next layer of unused cruft that can now go. The code lovingly
called it 'the "CONF classic" functions'. No tear was shed. Don't worry,
we still have the "New CONF" functions!

ok beck jsing

1 files changed, 1 insertions, 125 deletions

diff --git a/src/lib/libcrypto/conf/conf_lib.c b/src/lib/libcrypto/conf/conf_lib.c
index 4440cfe6fd..7d426d56b2 100644
--- a/src/lib/libcrypto/conf/conf_lib.c
+++ b/src/lib/libcrypto/conf/conf_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf_lib.c,v 1.23 2024/08/31 09:41:53 tb Exp $ */
+/* $OpenBSD: conf_lib.c,v 1.24 2024/08/31 09:50:52 tb Exp $ */
 /* Written by Richard Levitte (richard@levitte.org) for the OpenSSL
  * project 2000.
  */
@@ -77,130 +77,6 @@ CONF_set_nconf(CONF *conf, LHASH_OF(CONF_VALUE) *hash)
         conf->data = hash;
 }
 
-/* The following section contains the "CONF classic" functions,
-   rewritten in terms of the new CONF interface. */
-
-int
-CONF_set_default_method(CONF_METHOD *meth)
-{
-        default_CONF_method = meth;
-        return 1;
-}
-
-LHASH_OF(CONF_VALUE) *
-CONF_load(LHASH_OF(CONF_VALUE) *conf, const char *file, long *eline)
-{
-        LHASH_OF(CONF_VALUE) *ltmp;
-        BIO *in = NULL;
-
-        in = BIO_new_file(file, "rb");
-        if (in == NULL) {
-                CONFerror(ERR_R_SYS_LIB);
-                return NULL;
-        }
-
-        ltmp = CONF_load_bio(conf, in, eline);
-        BIO_free(in);
-
-        return ltmp;
-}
-LCRYPTO_ALIAS(CONF_load);
-
-LHASH_OF(CONF_VALUE) *
-CONF_load_fp(LHASH_OF(CONF_VALUE) *conf, FILE *fp, long *eline)
-{
-        BIO *btmp;
-        LHASH_OF(CONF_VALUE) *ltmp;
-
-        if (!(btmp = BIO_new_fp(fp, BIO_NOCLOSE))) {
-                CONFerror(ERR_R_BUF_LIB);
-                return NULL;
-        }
-        ltmp = CONF_load_bio(conf, btmp, eline);
-        BIO_free(btmp);
-        return ltmp;
-}
-
-LHASH_OF(CONF_VALUE) *
-CONF_load_bio(LHASH_OF(CONF_VALUE) *conf, BIO *bp, long *eline)
-{
-        CONF ctmp;
-        int ret;
-
-        CONF_set_nconf(&ctmp, conf);
-
-        ret = NCONF_load_bio(&ctmp, bp, eline);
-        if (ret)
-                return ctmp.data;
-        return NULL;
-}
-
-STACK_OF(CONF_VALUE) *
-CONF_get_section(LHASH_OF(CONF_VALUE) *conf, const char *section)
-{
-        if (conf == NULL) {
-                return NULL;
-        } else {
-                CONF ctmp;
-                CONF_set_nconf(&ctmp, conf);
-                return NCONF_get_section(&ctmp, section);
-        }
-}
-LCRYPTO_ALIAS(CONF_get_section);
-
-char *
-CONF_get_string(LHASH_OF(CONF_VALUE) *conf, const char *group,
-    const char *name)
-{
-        if (conf == NULL) {
-                return NCONF_get_string(NULL, group, name);
-        } else {
-                CONF ctmp;
-                CONF_set_nconf(&ctmp, conf);
-                return NCONF_get_string(&ctmp, group, name);
-        }
-}
-LCRYPTO_ALIAS(CONF_get_string);
-
-long
-CONF_get_number(LHASH_OF(CONF_VALUE) *conf, const char *group,
-    const char *name)
-{
-        int status;
-        long result = 0;
-
-        if (conf == NULL) {
-                status = NCONF_get_number_e(NULL, group, name, &result);
-        } else {
-                CONF ctmp;
-                CONF_set_nconf(&ctmp, conf);
-                status = NCONF_get_number_e(&ctmp, group, name, &result);
-        }
-
-        if (status == 0) {
-                /* This function does not believe in errors... */
-                ERR_clear_error();
-        }
-        return result;
-}
-LCRYPTO_ALIAS(CONF_get_number);
-
-void
-CONF_free(LHASH_OF(CONF_VALUE) *conf)
-{
-        CONF ctmp;
-
-        CONF_set_nconf(&ctmp, conf);
-        ctmp.meth->destroy_data(&ctmp);
-}
-LCRYPTO_ALIAS(CONF_free);
-
-/* The following section contains the "New CONF" functions.  They are
-   completely centralised around a new CONF structure that may contain
-   basically anything, but at least a method pointer and a table of data.
-   These functions are also written in terms of the bridge functions used
-   by the "CONF classic" functions, for consistency.  */
-
 CONF *
 NCONF_new(const CONF_METHOD *meth)
 {