Everything sane has stdio, and FILE *. we don't need ifdefs for this.

ok to firebomb from tedu@

7 files changed, 0 insertions, 20 deletions

diff --git a/src/lib/libcrypto/asn1/a_d2i_fp.c b/src/lib/libcrypto/asn1/a_d2i_fp.c
index af7a4bac30..a31dc35649 100644
--- a/src/lib/libcrypto/asn1/a_d2i_fp.c
+++ b/src/lib/libcrypto/asn1/a_d2i_fp.c
@@ -65,7 +65,6 @@
 static int asn1_d2i_read_bio(BIO *in, BUF_MEM **pb);
 
 #ifndef NO_OLD_ASN1
-#ifndef OPENSSL_NO_FP_API
 
 void *
 ASN1_d2i_fp(void *(*xnew)(void), d2i_of_void *d2i, FILE *in, void **x)
@@ -82,7 +81,6 @@ ASN1_d2i_fp(void *(*xnew)(void), d2i_of_void *d2i, FILE *in, void **x)
         BIO_free(b);
         return (ret);
 }
-#endif
 
 void *
 ASN1_d2i_bio(void *(*xnew)(void), d2i_of_void *d2i, BIO *in, void **x)
@@ -128,7 +126,6 @@ err:
         return (ret);
 }
 
-#ifndef OPENSSL_NO_FP_API
 void *
 ASN1_item_d2i_fp(const ASN1_ITEM *it, FILE *in, void *x)
 {
@@ -144,7 +141,6 @@ ASN1_item_d2i_fp(const ASN1_ITEM *it, FILE *in, void *x)
         BIO_free(b);
         return (ret);
 }
-#endif
 
 #define HEADER_SIZE   8
 static int
diff --git a/src/lib/libcrypto/asn1/a_i2d_fp.c b/src/lib/libcrypto/asn1/a_i2d_fp.c
index 007e612b4a..b9d066754b 100644
--- a/src/lib/libcrypto/asn1/a_i2d_fp.c
+++ b/src/lib/libcrypto/asn1/a_i2d_fp.c
@@ -63,7 +63,6 @@
 
 #ifndef NO_OLD_ASN1
 
-#ifndef OPENSSL_NO_FP_API
 int
 ASN1_i2d_fp(i2d_of_void *i2d, FILE *out, void *x)
 {
@@ -79,7 +78,6 @@ ASN1_i2d_fp(i2d_of_void *i2d, FILE *out, void *x)
         BIO_free(b);
         return (ret);
 }
-#endif
 
 int
 ASN1_i2d_bio(i2d_of_void *i2d, BIO *out, unsigned char *x)
@@ -115,7 +113,6 @@ ASN1_i2d_bio(i2d_of_void *i2d, BIO *out, unsigned char *x)
 
 #endif
 
-#ifndef OPENSSL_NO_FP_API
 int
 ASN1_item_i2d_fp(const ASN1_ITEM *it, FILE *out, void *x)
 {
@@ -131,7 +128,6 @@ ASN1_item_i2d_fp(const ASN1_ITEM *it, FILE *out, void *x)
         BIO_free(b);
         return (ret);
 }
-#endif
 
 int
 ASN1_item_i2d_bio(const ASN1_ITEM *it, BIO *out, void *x)
diff --git a/src/lib/libcrypto/asn1/a_strex.c b/src/lib/libcrypto/asn1/a_strex.c
index 684e933c4f..dcdd9d0f14 100644
--- a/src/lib/libcrypto/asn1/a_strex.c
+++ b/src/lib/libcrypto/asn1/a_strex.c
@@ -601,7 +601,6 @@ X509_NAME_print_ex(BIO *out, X509_NAME *nm, int indent, unsigned long flags)
         return do_name_ex(send_bio_chars, out, nm, indent, flags);
 }
 
-#ifndef OPENSSL_NO_FP_API
 int
 X509_NAME_print_ex_fp(FILE *fp, X509_NAME *nm, int indent, unsigned long flags)
 {
@@ -617,7 +616,6 @@ X509_NAME_print_ex_fp(FILE *fp, X509_NAME *nm, int indent, unsigned long flags)
         }
         return do_name_ex(send_fp_chars, fp, nm, indent, flags);
 }
-#endif
 
 int
 ASN1_STRING_print_ex(BIO *out, ASN1_STRING *str, unsigned long flags)
@@ -625,13 +623,11 @@ ASN1_STRING_print_ex(BIO *out, ASN1_STRING *str, unsigned long flags)
         return do_print_ex(send_bio_chars, out, flags, str);
 }
 
-#ifndef OPENSSL_NO_FP_API
 int
 ASN1_STRING_print_ex_fp(FILE *fp, ASN1_STRING *str, unsigned long flags)
 {
         return do_print_ex(send_fp_chars, fp, flags, str);
 }
-#endif
 
 /* Utility function: convert any string type to UTF8, returns number of bytes
  * in output string or a negative error code
diff --git a/src/lib/libcrypto/asn1/asn1.h b/src/lib/libcrypto/asn1/asn1.h
index 6543e5aafe..be417bb7eb 100644
--- a/src/lib/libcrypto/asn1/asn1.h
+++ b/src/lib/libcrypto/asn1/asn1.h
@@ -931,7 +931,6 @@ void *ASN1_item_dup(const ASN1_ITEM *it, void *x);
 #define M_ASN1_free_of(x, type) \
                 ASN1_item_free(CHECKED_PTR_OF(type, x), ASN1_ITEM_rptr(type))
 
-#ifndef OPENSSL_NO_FP_API
 void *ASN1_d2i_fp(void *(*xnew)(void), d2i_of_void *d2i, FILE *in, void **x);
 
 #define ASN1_d2i_fp_of(type,xnew,d2i,in,x) \
@@ -955,7 +954,6 @@ int ASN1_i2d_fp(i2d_of_void *i2d, FILE *out, void *x);
 
 int ASN1_item_i2d_fp(const ASN1_ITEM *it, FILE *out, void *x);
 int ASN1_STRING_print_ex_fp(FILE *fp, ASN1_STRING *str, unsigned long flags);
-#endif
 
 int ASN1_STRING_to_UTF8(unsigned char **out, ASN1_STRING *in);
 
diff --git a/src/lib/libcrypto/asn1/t_crl.c b/src/lib/libcrypto/asn1/t_crl.c
index cd1ed26174..ab4a8c60d2 100644
--- a/src/lib/libcrypto/asn1/t_crl.c
+++ b/src/lib/libcrypto/asn1/t_crl.c
@@ -64,7 +64,6 @@
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
 
-#ifndef OPENSSL_NO_FP_API
 int
 X509_CRL_print_fp(FILE *fp, X509_CRL *x)
 {
@@ -80,7 +79,6 @@ X509_CRL_print_fp(FILE *fp, X509_CRL *x)
         BIO_free(b);
         return (ret);
 }
-#endif
 
 int
 X509_CRL_print(BIO *out, X509_CRL *x)
diff --git a/src/lib/libcrypto/asn1/t_req.c b/src/lib/libcrypto/asn1/t_req.c
index 331440bed5..78f06950cc 100644
--- a/src/lib/libcrypto/asn1/t_req.c
+++ b/src/lib/libcrypto/asn1/t_req.c
@@ -70,7 +70,6 @@
 #include <openssl/dsa.h>
 #endif
 
-#ifndef OPENSSL_NO_FP_API
 int
 X509_REQ_print_fp(FILE *fp, X509_REQ *x)
 {
@@ -86,7 +85,6 @@ X509_REQ_print_fp(FILE *fp, X509_REQ *x)
         BIO_free(b);
         return (ret);
 }
-#endif
 
 int
 X509_REQ_print_ex(BIO *bp, X509_REQ *x, unsigned long nmflags,
diff --git a/src/lib/libcrypto/asn1/t_x509.c b/src/lib/libcrypto/asn1/t_x509.c
index 81333d67cf..efba93adeb 100644
--- a/src/lib/libcrypto/asn1/t_x509.c
+++ b/src/lib/libcrypto/asn1/t_x509.c
@@ -74,7 +74,6 @@
 #include <openssl/x509v3.h>
 #include "asn1_locl.h"
 
-#ifndef OPENSSL_NO_FP_API
 int
 X509_print_fp(FILE *fp, X509 *x)
 {
@@ -96,7 +95,6 @@ X509_print_ex_fp(FILE *fp, X509 *x, unsigned long nmflag, unsigned long cflag)
         BIO_free(b);
         return (ret);
 }
-#endif
 
 int
 X509_print(BIO *bp, X509 *x)