4 files changed, 5 insertions, 68 deletions

diff --git a/src/lib/libcrypto/conf/conf.h b/src/lib/libcrypto/conf/conf.h
index ba7fb69794..095066d31b 100644
--- a/src/lib/libcrypto/conf/conf.h
+++ b/src/lib/libcrypto/conf/conf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.h,v 1.13 2014/06/12 15:49:28 deraadt Exp $ */
+/* $OpenBSD: conf.h,v 1.14 2015/02/07 13:19:15 doug Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -149,9 +149,6 @@ struct conf_st {
 CONF *NCONF_new(CONF_METHOD *meth);
 CONF_METHOD *NCONF_default(void);
 CONF_METHOD *NCONF_WIN32(void);
-#if 0 /* Just to give you an idea of what I have in mind */
-CONF_METHOD *NCONF_XML(void);
-#endif
 void NCONF_free(CONF *conf);
 void NCONF_free_data(CONF *conf);
 
@@ -165,12 +162,7 @@ int NCONF_get_number_e(const CONF *conf, const char *group, const char *name,
 int NCONF_dump_fp(const CONF *conf, FILE *out);
 int NCONF_dump_bio(const CONF *conf, BIO *out);
 
-#if 0 /* The following function has no error checking,
-         and should therefore be avoided */
-long NCONF_get_number(CONF *conf, char *group, char *name);
-#else
 #define NCONF_get_number(c,g,n,r) NCONF_get_number_e(c,g,n,r)
-#endif
 
 /* Module functions */
 
diff --git a/src/lib/libcrypto/conf/conf_api.c b/src/lib/libcrypto/conf/conf_api.c
index 7480dda3d5..56a4f249ad 100644
--- a/src/lib/libcrypto/conf/conf_api.c
+++ b/src/lib/libcrypto/conf/conf_api.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf_api.c,v 1.11 2014/06/23 22:19:02 deraadt Exp $ */
+/* $OpenBSD: conf_api.c,v 1.12 2015/02/07 13:19:15 doug Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -165,28 +165,6 @@ _CONF_get_string(const CONF *conf, const char *section, const char *name)
         }
 }
 
-#if 0 /* There's no way to provide error checking with this function, so
-         force implementors of the higher levels to get a string and read
-         the number themselves. */
-long
-_CONF_get_number(CONF *conf, char *section, char *name)
-{
-        char *str;
-        long ret = 0;
-
-        str = _CONF_get_string(conf, section, name);
-        if (str == NULL)
-                return (0);
-        for (;;) {
-                if (conf->meth->is_number(conf, *str))
-                        ret = ret * 10 + conf->meth->to_int(conf, *str);
-                else
-                        return (ret);
-                str++;
-        }
-}
-#endif
-
 static unsigned long
 conf_value_hash(const CONF_VALUE *v)
 {
diff --git a/src/lib/libcrypto/conf/conf_def.c b/src/lib/libcrypto/conf/conf_def.c
index c437aeb457..e608e5fe9d 100644
--- a/src/lib/libcrypto/conf/conf_def.c
+++ b/src/lib/libcrypto/conf/conf_def.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf_def.c,v 1.28 2014/07/11 15:38:03 miod Exp $ */
+/* $OpenBSD: conf_def.c,v 1.29 2015/02/07 13:19:15 doug Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -388,27 +388,12 @@ again:
                                 }
                         } else
                                 tv = sv;
-#if 1
+
                         if (_CONF_add_string(conf, tv, v) == 0) {
                                 CONFerr(CONF_F_DEF_LOAD_BIO,
                                     ERR_R_MALLOC_FAILURE);
                                 goto err;
                         }
-#else
-                        v->section = tv->section;
-                        if (!sk_CONF_VALUE_push(ts, v)) {
-                                CONFerr(CONF_F_DEF_LOAD_BIO,
-                                    ERR_R_MALLOC_FAILURE);
-                                goto err;
-                        }
-                        vv = (CONF_VALUE *)lh_insert(conf->data, v);
-                        if (vv != NULL) {
-                                sk_CONF_VALUE_delete_ptr(ts, vv);
-                                free(vv->name);
-                                free(vv->value);
-                                free(vv);
-                        }
-#endif
                         v = NULL;
                 }
         }
diff --git a/src/lib/libcrypto/conf/conf_lib.c b/src/lib/libcrypto/conf/conf_lib.c
index 2119eb6219..a7c8be7c0d 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.12 2014/07/09 11:10:50 bcook Exp $ */
+/* $OpenBSD: conf_lib.c,v 1.13 2015/02/07 13:19:15 doug Exp $ */
 /* Written by Richard Levitte (richard@levitte.org) for the OpenSSL
  * project 2000.
  */
@@ -373,21 +373,3 @@ NCONF_dump_bio(const CONF *conf, BIO *out)
 
         return conf->meth->dump(conf, out);
 }
-
-
-/* This function should be avoided */
-#if 0
-long
-NCONF_get_number(CONF *conf, char *group, char *name)
-{
-        int status;
-        long ret = 0;
-
-        status = NCONF_get_number_e(conf, group, name, &ret);
-        if (status == 0) {
-                /* This function does not believe in errors... */
-                ERR_get_error();
-        }
-        return ret;
-}
-#endif