From d205a2aecb99564cccfbea61c39ebe3b0ddd7fb7 Mon Sep 17 00:00:00 2001
From: beck <>
Date: Thu, 29 May 2014 20:21:23 +0000
Subject: Everything sane has stdio, and FILE *. we don't need ifdefs for this.
 ok to firebomb from tedu@

---
 src/lib/libcrypto/conf/conf.h     | 4 ----
 src/lib/libcrypto/conf/conf_lib.c | 8 --------
 2 files changed, 12 deletions(-)

(limited to 'src/lib/libcrypto/conf')

diff --git a/src/lib/libcrypto/conf/conf.h b/src/lib/libcrypto/conf/conf.h
index 00efc12120..c54f87dca2 100644
--- a/src/lib/libcrypto/conf/conf.h
+++ b/src/lib/libcrypto/conf/conf.h
@@ -121,10 +121,8 @@ int CONF_set_default_method(CONF_METHOD *meth);
 void CONF_set_nconf(CONF *conf, LHASH_OF(CONF_VALUE) *hash);
 LHASH_OF(CONF_VALUE) *CONF_load(LHASH_OF(CONF_VALUE) *conf, const char *file,
     long *eline);
-#ifndef OPENSSL_NO_FP_API
 LHASH_OF(CONF_VALUE) *CONF_load_fp(LHASH_OF(CONF_VALUE) *conf, FILE *fp,
     long *eline);
-#endif
 LHASH_OF(CONF_VALUE) *CONF_load_bio(LHASH_OF(CONF_VALUE) *conf, BIO *bp, long *eline);
 STACK_OF(CONF_VALUE) *CONF_get_section(LHASH_OF(CONF_VALUE) *conf,
     const char *section);
@@ -158,9 +156,7 @@ void NCONF_free(CONF *conf);
 void NCONF_free_data(CONF *conf);
 
 int NCONF_load(CONF *conf, const char *file, long *eline);
-#ifndef OPENSSL_NO_FP_API
 int NCONF_load_fp(CONF *conf, FILE *fp, long *eline);
-#endif
 int NCONF_load_bio(CONF *conf, BIO *bp, long *eline);
 STACK_OF(CONF_VALUE) *NCONF_get_section(const CONF *conf, const char *section);
 char *NCONF_get_string(const CONF *conf, const char *group, const char *name);
diff --git a/src/lib/libcrypto/conf/conf_lib.c b/src/lib/libcrypto/conf/conf_lib.c
index 35bdda3d64..164e9bebf8 100644
--- a/src/lib/libcrypto/conf/conf_lib.c
+++ b/src/lib/libcrypto/conf/conf_lib.c
@@ -106,7 +106,6 @@ LHASH_OF(CONF_VALUE) *CONF_load(LHASH_OF(CONF_VALUE) *conf, const char *file,
 	return ltmp;
 }
 
-#ifndef OPENSSL_NO_FP_API
 LHASH_OF(CONF_VALUE) *CONF_load_fp(LHASH_OF(CONF_VALUE) *conf, FILE *fp,
     long *eline)
 {
@@ -121,7 +120,6 @@ LHASH_OF(CONF_VALUE) *CONF_load_fp(LHASH_OF(CONF_VALUE) *conf, FILE *fp,
 	BIO_free(btmp);
 	return ltmp;
 }
-#endif
 
 LHASH_OF(CONF_VALUE) *CONF_load_bio(LHASH_OF(CONF_VALUE) *conf, BIO *bp,
     long *eline)
@@ -193,7 +191,6 @@ CONF_free(LHASH_OF(CONF_VALUE) *conf)
 	NCONF_free_data(&ctmp);
 }
 
-#ifndef OPENSSL_NO_FP_API
 int
 CONF_dump_fp(LHASH_OF(CONF_VALUE) *conf, FILE *out)
 {
@@ -208,7 +205,6 @@ CONF_dump_fp(LHASH_OF(CONF_VALUE) *conf, FILE *out)
 	BIO_free(btmp);
 	return ret;
 }
-#endif
 
 int
 CONF_dump_bio(LHASH_OF(CONF_VALUE) *conf, BIO *out)
@@ -269,7 +265,6 @@ NCONF_load(CONF *conf, const char *file, long *eline)
 	return conf->meth->load(conf, file, eline);
 }
 
-#ifndef OPENSSL_NO_FP_API
 int
 NCONF_load_fp(CONF *conf, FILE *fp, long *eline)
 {
@@ -284,7 +279,6 @@ NCONF_load_fp(CONF *conf, FILE *fp, long *eline)
 	BIO_free(btmp);
 	return ret;
 }
-#endif
 
 int
 NCONF_load_bio(CONF *conf, BIO *bp, long *eline)
@@ -357,7 +351,6 @@ NCONF_get_number_e(const CONF *conf, const char *group, const char *name,
 	return 1;
 }
 
-#ifndef OPENSSL_NO_FP_API
 int
 NCONF_dump_fp(const CONF *conf, FILE *out)
 {
@@ -371,7 +364,6 @@ NCONF_dump_fp(const CONF *conf, FILE *out)
 	BIO_free(btmp);
 	return ret;
 }
-#endif
 
 int
 NCONF_dump_bio(const CONF *conf, BIO *out)
-- 
cgit v1.2.3-55-g6feb