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

ok to firebomb from tedu@

82 files changed, 0 insertions, 338 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)
diff --git a/src/lib/libcrypto/bio/b_dump.c b/src/lib/libcrypto/bio/b_dump.c
index 65238299f2..d4750f66be 100644
--- a/src/lib/libcrypto/bio/b_dump.c
+++ b/src/lib/libcrypto/bio/b_dump.c
@@ -147,7 +147,6 @@ BIO_dump_indent_cb(int (*cb)(const void *data, size_t len, void *u),
         return (ret);
 }
 
-#ifndef OPENSSL_NO_FP_API
 static int
 write_fp(const void *data, size_t len, void *fp)
 {
@@ -165,7 +164,6 @@ BIO_dump_indent_fp(FILE *fp, const char *s, int len, int indent)
 {
         return BIO_dump_indent_cb(write_fp, fp, s, len, indent);
 }
-#endif
 
 static int
 write_bio(const void *data, size_t len, void *bp)
diff --git a/src/lib/libcrypto/bio/bio.h b/src/lib/libcrypto/bio/bio.h
index 67574d9fa4..6809b70e9d 100644
--- a/src/lib/libcrypto/bio/bio.h
+++ b/src/lib/libcrypto/bio/bio.h
@@ -61,9 +61,7 @@
 
 #include <openssl/opensslconf.h>
 
-#ifndef OPENSSL_NO_FP_API
 # include <stdio.h>
-#endif
 #include <stdarg.h>
 
 #include <openssl/crypto.h>
@@ -619,12 +617,10 @@ int
 BIO_asn1_get_suffix(BIO *b, asn1_ps_func **psuffix,
 asn1_ps_func **psuffix_free);
 
-# ifndef OPENSSL_NO_FP_API
 BIO_METHOD *BIO_s_file(void );
 BIO *BIO_new_file(const char *filename, const char *mode);
 BIO *BIO_new_fp(FILE *stream, int close_flag);
 # define BIO_s_file_internal    BIO_s_file
-# endif
 BIO *   BIO_new(BIO_METHOD *type);
 int     BIO_set(BIO *a, BIO_METHOD *type);
 int     BIO_free(BIO *a);
@@ -694,10 +690,8 @@ BIO_dump_indent_cb(int (*cb)(const void *data, size_t len, void *u),
 void *u, const char *s, int len, int indent);
 int BIO_dump(BIO *b, const char *bytes, int len);
 int BIO_dump_indent(BIO *b, const char *bytes, int len, int indent);
-#ifndef OPENSSL_NO_FP_API
 int BIO_dump_fp(FILE *fp, const char *s, int len);
 int BIO_dump_indent_fp(FILE *fp, const char *s, int len, int indent);
-#endif
 struct hostent *BIO_gethostbyname(const char *name);
 /* We might want a thread-safe interface too:
  * struct hostent *BIO_gethostbyname_r(const char *name,
diff --git a/src/lib/libcrypto/bn/bn.h b/src/lib/libcrypto/bn/bn.h
index ce04c4d217..5d2f13877e 100644
--- a/src/lib/libcrypto/bn/bn.h
+++ b/src/lib/libcrypto/bn/bn.h
@@ -127,9 +127,7 @@
 
 #include <openssl/opensslconf.h>
 
-#ifndef OPENSSL_NO_FP_API
 #include <stdio.h> /* FILE */
-#endif
 #include <openssl/ossl_typ.h>
 #include <openssl/crypto.h>
 
@@ -442,9 +440,7 @@ int	BN_mod_exp_simple(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
     const BIGNUM *m, BN_CTX *ctx);
 
 int     BN_mask_bits(BIGNUM *a, int n);
-#ifndef OPENSSL_NO_FP_API
 int     BN_print_fp(FILE *fp, const BIGNUM *a);
-#endif
 #ifdef HEADER_BIO_H
 int     BN_print(BIO *fp, const BIGNUM *a);
 #else
diff --git a/src/lib/libcrypto/bn/bn_print.c b/src/lib/libcrypto/bn/bn_print.c
index c09c64db25..3a0fb25369 100644
--- a/src/lib/libcrypto/bn/bn_print.c
+++ b/src/lib/libcrypto/bn/bn_print.c
@@ -328,7 +328,6 @@ BN_asc2bn(BIGNUM **bn, const char *a)
 }
 
 #ifndef OPENSSL_NO_BIO
-#ifndef OPENSSL_NO_FP_API
 int
 BN_print_fp(FILE *fp, const BIGNUM *a)
 {
@@ -342,7 +341,6 @@ BN_print_fp(FILE *fp, const BIGNUM *a)
         BIO_free(b);
         return (ret);
 }
-#endif
 
 int
 BN_print(BIO *bp, const BIGNUM *a)
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)
diff --git a/src/lib/libcrypto/crypto.h b/src/lib/libcrypto/crypto.h
index 9307687b27..e3cf3ec7a9 100644
--- a/src/lib/libcrypto/crypto.h
+++ b/src/lib/libcrypto/crypto.h
@@ -121,9 +121,7 @@
 
 #include <openssl/opensslconf.h>
 
-#ifndef OPENSSL_NO_FP_API
 #include <stdio.h>
-#endif
 
 #include <openssl/stack.h>
 #include <openssl/safestack.h>
@@ -516,9 +514,7 @@ void CRYPTO_dbg_set_options(long bits);
 long CRYPTO_dbg_get_options(void);
 
 
-#ifndef OPENSSL_NO_FP_API
 void CRYPTO_mem_leaks_fp(FILE *);
-#endif
 void CRYPTO_mem_leaks(struct bio_st *bio);
 /* unsigned long order, char *file, int line, int num_bytes, char *addr */
 typedef void *CRYPTO_MEM_LEAK_CB(unsigned long, const char *, int, int, void *);
diff --git a/src/lib/libcrypto/dh/dh.h b/src/lib/libcrypto/dh/dh.h
index 36ca149b73..0d313ea9b4 100644
--- a/src/lib/libcrypto/dh/dh.h
+++ b/src/lib/libcrypto/dh/dh.h
@@ -212,9 +212,7 @@ int	DH_generate_key(DH *dh);
 int     DH_compute_key(unsigned char *key,const BIGNUM *pub_key,DH *dh);
 DH *    d2i_DHparams(DH **a,const unsigned char **pp, long length);
 int     i2d_DHparams(const DH *a,unsigned char **pp);
-#ifndef OPENSSL_NO_FP_API
 int     DHparams_print_fp(FILE *fp, const DH *x);
-#endif
 #ifndef OPENSSL_NO_BIO
 int     DHparams_print(BIO *bp, const DH *x);
 #else
diff --git a/src/lib/libcrypto/dh/dh_prn.c b/src/lib/libcrypto/dh/dh_prn.c
index ae58c2ac87..9745798628 100644
--- a/src/lib/libcrypto/dh/dh_prn.c
+++ b/src/lib/libcrypto/dh/dh_prn.c
@@ -61,7 +61,6 @@
 #include <openssl/evp.h>
 #include <openssl/dh.h>
 
-#ifndef OPENSSL_NO_FP_API
 int DHparams_print_fp(FILE *fp, const DH *x)
         {
         BIO *b;
@@ -77,4 +76,3 @@ int DHparams_print_fp(FILE *fp, const DH *x)
         BIO_free(b);
         return(ret);
         }
-#endif
diff --git a/src/lib/libcrypto/dsa/dsa.h b/src/lib/libcrypto/dsa/dsa.h
index c871499201..48f7f8196e 100644
--- a/src/lib/libcrypto/dsa/dsa.h
+++ b/src/lib/libcrypto/dsa/dsa.h
@@ -247,10 +247,8 @@ int	i2d_DSAparams(const DSA *a,unsigned char **pp);
 int     DSAparams_print(BIO *bp, const DSA *x);
 int     DSA_print(BIO *bp, const DSA *x, int off);
 #endif
-#ifndef OPENSSL_NO_FP_API
 int     DSAparams_print_fp(FILE *fp, const DSA *x);
 int     DSA_print_fp(FILE *bp, const DSA *x, int off);
-#endif
 
 #define DSS_prime_checks 50
 /* Primality test according to FIPS PUB 186[-1], Appendix 2.1:
diff --git a/src/lib/libcrypto/dsa/dsa_prn.c b/src/lib/libcrypto/dsa/dsa_prn.c
index 6f29f5e240..638f541975 100644
--- a/src/lib/libcrypto/dsa/dsa_prn.c
+++ b/src/lib/libcrypto/dsa/dsa_prn.c
@@ -61,7 +61,6 @@
 #include <openssl/evp.h>
 #include <openssl/dsa.h>
 
-#ifndef OPENSSL_NO_FP_API
 int DSA_print_fp(FILE *fp, const DSA *x, int off)
         {
         BIO *b;
@@ -93,7 +92,6 @@ int DSAparams_print_fp(FILE *fp, const DSA *x)
         BIO_free(b);
         return(ret);
         }
-#endif
 
 int DSA_print(BIO *bp, const DSA *x, int off)
         {
diff --git a/src/lib/libcrypto/ec/ec.h b/src/lib/libcrypto/ec/ec.h
index 86f8c6820d..1e0b929304 100644
--- a/src/lib/libcrypto/ec/ec.h
+++ b/src/lib/libcrypto/ec/ec.h
@@ -695,9 +695,7 @@ int i2d_ECPKParameters(const EC_GROUP *, unsigned char **out);
 #ifndef OPENSSL_NO_BIO
 int     ECPKParameters_print(BIO *bp, const EC_GROUP *x, int off);
 #endif
-#ifndef OPENSSL_NO_FP_API
 int     ECPKParameters_print_fp(FILE *fp, const EC_GROUP *x, int off);
-#endif
 
 
 /********************************************************************/
@@ -930,7 +928,6 @@ int	ECParameters_print(BIO *bp, const EC_KEY *key);
 int     EC_KEY_print(BIO *bp, const EC_KEY *key, int off);
 
 #endif
-#ifndef OPENSSL_NO_FP_API
 /** Prints out the ec parameters on human readable form.
  *  \param  fp   file descriptor to which the information is printed
  *  \param  key  EC_KEY object
@@ -946,7 +943,6 @@ int	ECParameters_print_fp(FILE *fp, const EC_KEY *key);
  */
 int     EC_KEY_print_fp(FILE *fp, const EC_KEY *key, int off);
 
-#endif
 
 #define ECParameters_dup(x) ASN1_dup_of(EC_KEY,i2d_ECParameters,d2i_ECParameters,x)
 
diff --git a/src/lib/libcrypto/ec/eck_prn.c b/src/lib/libcrypto/ec/eck_prn.c
index 86107d5142..3f2973e5b6 100644
--- a/src/lib/libcrypto/ec/eck_prn.c
+++ b/src/lib/libcrypto/ec/eck_prn.c
@@ -67,7 +67,6 @@
 #include <openssl/ec.h>
 #include <openssl/bn.h>
 
-#ifndef OPENSSL_NO_FP_API
 int 
 ECPKParameters_print_fp(FILE * fp, const EC_GROUP * x, int off)
 {
@@ -115,7 +114,6 @@ ECParameters_print_fp(FILE * fp, const EC_KEY * x)
         BIO_free(b);
         return (ret);
 }
-#endif
 
 int 
 EC_KEY_print(BIO * bp, const EC_KEY * x, int off)
diff --git a/src/lib/libcrypto/err/err.h b/src/lib/libcrypto/err/err.h
index 601f56a624..0396aba726 100644
--- a/src/lib/libcrypto/err/err.h
+++ b/src/lib/libcrypto/err/err.h
@@ -114,10 +114,8 @@
 
 #include <openssl/opensslconf.h>
 
-#ifndef OPENSSL_NO_FP_API
 #include <stdio.h>
 #include <stdlib.h>
-#endif
 
 #include <openssl/ossl_typ.h>
 #ifndef OPENSSL_NO_BIO
@@ -337,9 +335,7 @@ const char *ERR_func_error_string(unsigned long e);
 const char *ERR_reason_error_string(unsigned long e);
 void ERR_print_errors_cb(int (*cb)(const char *str, size_t len, void *u),
     void *u);
-#ifndef OPENSSL_NO_FP_API
 void ERR_print_errors_fp(FILE *fp);
-#endif
 #ifndef OPENSSL_NO_BIO
 void ERR_print_errors(BIO *bp);
 #endif
diff --git a/src/lib/libcrypto/err/err_prn.c b/src/lib/libcrypto/err/err_prn.c
index d6b488fee9..7790287a3f 100644
--- a/src/lib/libcrypto/err/err_prn.c
+++ b/src/lib/libcrypto/err/err_prn.c
@@ -86,7 +86,6 @@ ERR_print_errors_cb(int (*cb)(const char *str, size_t len, void *u), void *u)
         }
 }
 
-#ifndef OPENSSL_NO_FP_API
 static int
 print_fp(const char *str, size_t len, void *fp)
 {
@@ -103,7 +102,6 @@ ERR_print_errors_fp(FILE *fp)
 {
         ERR_print_errors_cb(print_fp, fp);
 }
-#endif
 
 static int
 print_bio(const char *str, size_t len, void *bp)
diff --git a/src/lib/libcrypto/lhash/lh_stats.c b/src/lib/libcrypto/lhash/lh_stats.c
index 34c7d77cb1..4676d9810d 100644
--- a/src/lib/libcrypto/lhash/lh_stats.c
+++ b/src/lib/libcrypto/lhash/lh_stats.c
@@ -140,7 +140,6 @@ lh_node_usage_stats(LHASH *lh, FILE *out)
 
 #else
 
-#ifndef OPENSSL_NO_FP_API
 void
 lh_stats(const _LHASH *lh, FILE *fp)
 {
@@ -183,7 +182,6 @@ lh_node_usage_stats(const _LHASH *lh, FILE *fp)
 end:;
 }
 
-#endif
 
 void
 lh_stats_bio(const _LHASH *lh, BIO *out)
diff --git a/src/lib/libcrypto/lhash/lhash.h b/src/lib/libcrypto/lhash/lhash.h
index 187a284243..8147417cd8 100644
--- a/src/lib/libcrypto/lhash/lhash.h
+++ b/src/lib/libcrypto/lhash/lhash.h
@@ -65,9 +65,7 @@
 
 #include <openssl/opensslconf.h>
 
-#ifndef OPENSSL_NO_FP_API
 #include <stdio.h>
-#endif
 
 #ifndef OPENSSL_NO_BIO
 #include <openssl/bio.h>
@@ -181,11 +179,9 @@ void lh_doall_arg(_LHASH *lh, LHASH_DOALL_ARG_FN_TYPE func, void *arg);
 unsigned long lh_strhash(const char *c);
 unsigned long lh_num_items(const _LHASH *lh);
 
-#ifndef OPENSSL_NO_FP_API
 void lh_stats(const _LHASH *lh, FILE *out);
 void lh_node_stats(const _LHASH *lh, FILE *out);
 void lh_node_usage_stats(const _LHASH *lh, FILE *out);
-#endif
 
 #ifndef OPENSSL_NO_BIO
 void lh_stats_bio(const _LHASH *lh, BIO *out);
diff --git a/src/lib/libcrypto/mem_dbg.c b/src/lib/libcrypto/mem_dbg.c
index 4337c52774..288ee907c3 100644
--- a/src/lib/libcrypto/mem_dbg.c
+++ b/src/lib/libcrypto/mem_dbg.c
@@ -187,13 +187,11 @@ CRYPTO_mem_leaks(BIO *b)
         return;
 }
 
-#ifndef OPENSSL_NO_FP_API
 void
 CRYPTO_mem_leaks_fp(FILE *fp)
 {
         return;
 }
-#endif
 
 
 void
diff --git a/src/lib/libcrypto/pem/pem.h b/src/lib/libcrypto/pem/pem.h
index 6eae9345a1..daf5b1375d 100644
--- a/src/lib/libcrypto/pem/pem.h
+++ b/src/lib/libcrypto/pem/pem.h
@@ -206,15 +206,6 @@ typedef struct pem_ctx_st {
  * IMPLEMENT_PEM_rw(...) or IMPLEMENT_PEM_rw_cb(...)
  */
 
-#ifdef OPENSSL_NO_FP_API
-
-#define IMPLEMENT_PEM_read_fp(name, type, str, asn1) /**/
-#define IMPLEMENT_PEM_write_fp(name, type, str, asn1) /**/
-#define IMPLEMENT_PEM_write_fp_const(name, type, str, asn1) /**/
-#define IMPLEMENT_PEM_write_cb_fp(name, type, str, asn1) /**/
-#define IMPLEMENT_PEM_write_cb_fp_const(name, type, str, asn1) /**/
-
-#else
 
 #define IMPLEMENT_PEM_read_fp(name, type, str, asn1) \
 type *PEM_read_##name(FILE *fp, type **x, pem_password_cb *cb, void *u)\
@@ -250,7 +241,6 @@ int PEM_write_##name(FILE *fp, type *x, const EVP_CIPHER *enc, \
         return PEM_ASN1_write((i2d_of_void *)i2d_##asn1,str,fp,x,enc,kstr,klen,cb,u); \
         }
 
-#endif
 
 #define IMPLEMENT_PEM_read_bio(name, type, str, asn1) \
 type *PEM_read_bio_##name(BIO *bp, type **x, pem_password_cb *cb, void *u)\
@@ -318,13 +308,6 @@ int PEM_write_bio_##name(BIO *bp, type *x, const EVP_CIPHER *enc, \
 
 /* These are the same except they are for the declarations */
 
-#if defined(OPENSSL_NO_FP_API)
-
-#define DECLARE_PEM_read_fp(name, type) /**/
-#define DECLARE_PEM_write_fp(name, type) /**/
-#define DECLARE_PEM_write_cb_fp(name, type) /**/
-
-#else
 
 #define DECLARE_PEM_read_fp(name, type) \
         type *PEM_read_##name(FILE *fp, type **x, pem_password_cb *cb, void *u);
@@ -339,7 +322,6 @@ int PEM_write_bio_##name(BIO *bp, type *x, const EVP_CIPHER *enc, \
         int PEM_write_##name(FILE *fp, type *x, const EVP_CIPHER *enc, \
              unsigned char *kstr, int klen, pem_password_cb *cb, void *u);
 
-#endif
 
 #ifndef OPENSSL_NO_BIO
 #define DECLARE_PEM_read_bio(name, type) \
diff --git a/src/lib/libcrypto/pem/pem_all.c b/src/lib/libcrypto/pem/pem_all.c
index 8b54d1a698..2cca8fbc39 100644
--- a/src/lib/libcrypto/pem/pem_all.c
+++ b/src/lib/libcrypto/pem/pem_all.c
@@ -186,7 +186,6 @@ PEM_read_bio_RSAPrivateKey(BIO *bp, RSA **rsa, pem_password_cb *cb, void *u)
         return pkey_get_rsa(pktmp, rsa);
 }
 
-#ifndef OPENSSL_NO_FP_API
 
 RSA *
 PEM_read_RSAPrivateKey(FILE *fp, RSA **rsa, pem_password_cb *cb, void *u)
@@ -197,7 +196,6 @@ PEM_read_RSAPrivateKey(FILE *fp, RSA **rsa, pem_password_cb *cb, void *u)
         return pkey_get_rsa(pktmp, rsa);
 }
 
-#endif
 
 IMPLEMENT_PEM_write_cb_const(RSAPrivateKey, RSA, PEM_STRING_RSA, RSAPrivateKey)
 
@@ -239,7 +237,6 @@ IMPLEMENT_PEM_write_cb_const(DSAPrivateKey, DSA, PEM_STRING_DSA, DSAPrivateKey)
 
 IMPLEMENT_PEM_rw(DSA_PUBKEY, DSA, PEM_STRING_PUBLIC, DSA_PUBKEY)
 
-#ifndef OPENSSL_NO_FP_API
 
 DSA *
 PEM_read_DSAPrivateKey(FILE *fp, DSA **dsa, pem_password_cb *cb, void *u)
@@ -250,7 +247,6 @@ PEM_read_DSAPrivateKey(FILE *fp, DSA **dsa, pem_password_cb *cb, void *u)
         return pkey_get_dsa(pktmp, dsa);        /* will free pktmp */
 }
 
-#endif
 
 IMPLEMENT_PEM_rw_const(DSAparams, DSA, PEM_STRING_DSAPARAMS, DSAparams)
 
@@ -292,7 +288,6 @@ IMPLEMENT_PEM_write_cb(ECPrivateKey, EC_KEY, PEM_STRING_ECPRIVATEKEY,
 
 IMPLEMENT_PEM_rw(EC_PUBKEY, EC_KEY, PEM_STRING_PUBLIC, EC_PUBKEY)
 
-#ifndef OPENSSL_NO_FP_API
 
 EC_KEY *
 PEM_read_ECPrivateKey(FILE *fp, EC_KEY **eckey, pem_password_cb *cb, void *u)
@@ -303,7 +298,6 @@ PEM_read_ECPrivateKey(FILE *fp, EC_KEY **eckey, pem_password_cb *cb, void *u)
         return pkey_get_eckey(pktmp, eckey);    /* will free pktmp */
 }
 
-#endif
 
 #endif
 
diff --git a/src/lib/libcrypto/pem/pem_info.c b/src/lib/libcrypto/pem/pem_info.c
index 967d6d2d41..40600e30f3 100644
--- a/src/lib/libcrypto/pem/pem_info.c
+++ b/src/lib/libcrypto/pem/pem_info.c
@@ -70,7 +70,6 @@
 #include <openssl/dsa.h>
 #endif
 
-#ifndef OPENSSL_NO_FP_API
 STACK_OF(X509_INFO) *
 PEM_X509_INFO_read(FILE *fp, STACK_OF(X509_INFO) *sk, pem_password_cb *cb,
     void *u)
@@ -87,7 +86,6 @@ PEM_X509_INFO_read(FILE *fp, STACK_OF(X509_INFO) *sk, pem_password_cb *cb,
         BIO_free(b);
         return (ret);
 }
-#endif
 
 STACK_OF(X509_INFO) *
 PEM_X509_INFO_read_bio(BIO *bp, STACK_OF(X509_INFO) *sk, pem_password_cb *cb,
diff --git a/src/lib/libcrypto/pem/pem_lib.c b/src/lib/libcrypto/pem/pem_lib.c
index 9bc2b27285..58d2bfbee9 100644
--- a/src/lib/libcrypto/pem/pem_lib.c
+++ b/src/lib/libcrypto/pem/pem_lib.c
@@ -85,12 +85,6 @@ int pem_check_suffix(const char *pem_str, const char *suffix);
 int
 PEM_def_callback(char *buf, int num, int w, void *key)
 {
-#ifdef OPENSSL_NO_FP_API
-        /* We should not ever call the default callback routine from
-         * windows. */
-        PEMerr(PEM_F_PEM_DEF_CALLBACK, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
-        return (-1);
-#else
         int i, j;
         const char *prompt;
 
@@ -120,7 +114,6 @@ PEM_def_callback(char *buf, int num, int w, void *key)
                         break;
         }
         return (j);
-#endif
 }
 
 void
@@ -163,7 +156,6 @@ PEM_dek_info(char *buf, const char *type, int len, char *str)
         buf[j + i * 2 + 1] = '\0';
 }
 
-#ifndef OPENSSL_NO_FP_API
 void *
 PEM_ASN1_read(d2i_of_void *d2i, const char *name, FILE *fp, void **x,
     pem_password_cb *cb, void *u)
@@ -180,7 +172,6 @@ PEM_ASN1_read(d2i_of_void *d2i, const char *name, FILE *fp, void **x,
         BIO_free(b);
         return (ret);
 }
-#endif
 
 static int
 check_pem(const char *nm, const char *name)
@@ -320,7 +311,6 @@ err:
         return ret;
 }
 
-#ifndef OPENSSL_NO_FP_API
 int
 PEM_ASN1_write(i2d_of_void *i2d, const char *name, FILE *fp, void *x,
     const EVP_CIPHER *enc, unsigned char *kstr, int klen,
@@ -338,7 +328,6 @@ PEM_ASN1_write(i2d_of_void *i2d, const char *name, FILE *fp, void *x,
         BIO_free(b);
         return (ret);
 }
-#endif
 
 int
 PEM_ASN1_write_bio(i2d_of_void *i2d, const char *name, BIO *bp, void *x,
@@ -576,7 +565,6 @@ load_iv(char **fromp, unsigned char *to, int num)
         return (1);
 }
 
-#ifndef OPENSSL_NO_FP_API
 int
 PEM_write(FILE *fp, char *name, char *header, unsigned char *data, long len)
 {
@@ -592,7 +580,6 @@ PEM_write(FILE *fp, char *name, char *header, unsigned char *data, long len)
         BIO_free(b);
         return (ret);
 }
-#endif
 
 int
 PEM_write_bio(BIO *bp, const char *name, char *header, unsigned char *data,
@@ -655,7 +642,6 @@ err:
         return (0);
 }
 
-#ifndef OPENSSL_NO_FP_API
 int
 PEM_read(FILE *fp, char **name, char **header, unsigned char **data, long *len)
 {
@@ -671,7 +657,6 @@ PEM_read(FILE *fp, char **name, char **header, unsigned char **data, long *len)
         BIO_free(b);
         return (ret);
 }
-#endif
 
 int
 PEM_read_bio(BIO *bp, char **name, char **header, unsigned char **data,
diff --git a/src/lib/libcrypto/pem/pem_pk8.c b/src/lib/libcrypto/pem/pem_pk8.c
index 228ecfceaf..2e0a44d4b8 100644
--- a/src/lib/libcrypto/pem/pem_pk8.c
+++ b/src/lib/libcrypto/pem/pem_pk8.c
@@ -190,7 +190,6 @@ d2i_PKCS8PrivateKey_bio(BIO *bp, EVP_PKEY **x, pem_password_cb *cb, void *u)
         return ret;
 }
 
-#ifndef OPENSSL_NO_FP_API
 
 int
 i2d_PKCS8PrivateKey_fp(FILE *fp, EVP_PKEY *x, const EVP_CIPHER *enc,
@@ -251,7 +250,6 @@ d2i_PKCS8PrivateKey_fp(FILE *fp, EVP_PKEY **x, pem_password_cb *cb, void *u)
         return ret;
 }
 
-#endif
 
 IMPLEMENT_PEM_rw(PKCS8, X509_SIG, PEM_STRING_PKCS8, X509_SIG)
 IMPLEMENT_PEM_rw(PKCS8_PRIV_KEY_INFO, PKCS8_PRIV_KEY_INFO, PEM_STRING_PKCS8INF,
diff --git a/src/lib/libcrypto/pem/pem_pkey.c b/src/lib/libcrypto/pem/pem_pkey.c
index bcce39281e..843ade927a 100644
--- a/src/lib/libcrypto/pem/pem_pkey.c
+++ b/src/lib/libcrypto/pem/pem_pkey.c
@@ -217,7 +217,6 @@ PEM_write_bio_Parameters(BIO *bp, EVP_PKEY *x)
             pem_str, bp, x, NULL, NULL, 0, 0, NULL);
 }
 
-#ifndef OPENSSL_NO_FP_API
 EVP_PKEY *
 PEM_read_PrivateKey(FILE *fp, EVP_PKEY **x, pem_password_cb *cb, void *u)
 {
@@ -250,4 +249,3 @@ PEM_write_PrivateKey(FILE *fp, EVP_PKEY *x, const EVP_CIPHER *enc,
         return ret;
 }
 
-#endif
diff --git a/src/lib/libcrypto/pkcs12/p12_utl.c b/src/lib/libcrypto/pkcs12/p12_utl.c
index 9c58036169..ec3dcb84fd 100644
--- a/src/lib/libcrypto/pkcs12/p12_utl.c
+++ b/src/lib/libcrypto/pkcs12/p12_utl.c
@@ -100,23 +100,19 @@ int i2d_PKCS12_bio(BIO *bp, PKCS12 *p12)
         return ASN1_item_i2d_bio(ASN1_ITEM_rptr(PKCS12), bp, p12);
 }
 
-#ifndef OPENSSL_NO_FP_API
 int i2d_PKCS12_fp(FILE *fp, PKCS12 *p12)
 {
         return ASN1_item_i2d_fp(ASN1_ITEM_rptr(PKCS12), fp, p12);
 }
-#endif
 
 PKCS12 *d2i_PKCS12_bio(BIO *bp, PKCS12 **p12)
 {
         return ASN1_item_d2i_bio(ASN1_ITEM_rptr(PKCS12), bp, p12);
 }
-#ifndef OPENSSL_NO_FP_API
 PKCS12 *d2i_PKCS12_fp(FILE *fp, PKCS12 **p12)
 {
         return ASN1_item_d2i_fp(ASN1_ITEM_rptr(PKCS12), fp, p12);
 }
-#endif
 
 PKCS12_SAFEBAG *PKCS12_x5092certbag(X509 *x509)
 {
diff --git a/src/lib/libcrypto/pkcs7/pkcs7.h b/src/lib/libcrypto/pkcs7/pkcs7.h
index a1220aba00..fa4a19dab0 100644
--- a/src/lib/libcrypto/pkcs7/pkcs7.h
+++ b/src/lib/libcrypto/pkcs7/pkcs7.h
@@ -273,10 +273,8 @@ DECLARE_ASN1_FUNCTIONS(PKCS7_ISSUER_AND_SERIAL)
 
 int PKCS7_ISSUER_AND_SERIAL_digest(PKCS7_ISSUER_AND_SERIAL *data,const EVP_MD *type,
         unsigned char *md,unsigned int *len);
-#ifndef OPENSSL_NO_FP_API
 PKCS7 *d2i_PKCS7_fp(FILE *fp,PKCS7 **p7);
 int i2d_PKCS7_fp(FILE *fp,PKCS7 *p7);
-#endif
 PKCS7 *PKCS7_dup(PKCS7 *p7);
 PKCS7 *d2i_PKCS7_bio(BIO *bp,PKCS7 **p7);
 int i2d_PKCS7_bio(BIO *bp,PKCS7 *p7);
diff --git a/src/lib/libcrypto/rsa/rsa.h b/src/lib/libcrypto/rsa/rsa.h
index 5f269e577a..2b78d58bb6 100644
--- a/src/lib/libcrypto/rsa/rsa.h
+++ b/src/lib/libcrypto/rsa/rsa.h
@@ -333,9 +333,7 @@ typedef struct rsa_pss_params_st
 
 DECLARE_ASN1_FUNCTIONS(RSA_PSS_PARAMS)
 
-#ifndef OPENSSL_NO_FP_API
 int     RSA_print_fp(FILE *fp, const RSA *r,int offset);
-#endif
 
 #ifndef OPENSSL_NO_BIO
 int     RSA_print(BIO *bp, const RSA *r,int offset);
diff --git a/src/lib/libcrypto/rsa/rsa_prn.c b/src/lib/libcrypto/rsa/rsa_prn.c
index 224db0fae5..c0e75065f0 100644
--- a/src/lib/libcrypto/rsa/rsa_prn.c
+++ b/src/lib/libcrypto/rsa/rsa_prn.c
@@ -61,7 +61,6 @@
 #include <openssl/rsa.h>
 #include <openssl/evp.h>
 
-#ifndef OPENSSL_NO_FP_API
 int RSA_print_fp(FILE *fp, const RSA *x, int off)
         {
         BIO *b;
@@ -77,7 +76,6 @@ int RSA_print_fp(FILE *fp, const RSA *x, int off)
         BIO_free(b);
         return(ret);
         }
-#endif
 
 int RSA_print(BIO *bp, const RSA *x, int off)
         {
diff --git a/src/lib/libcrypto/ts/ts_asn1.c b/src/lib/libcrypto/ts/ts_asn1.c
index 9e16b01f93..b5dc453510 100644
--- a/src/lib/libcrypto/ts/ts_asn1.c
+++ b/src/lib/libcrypto/ts/ts_asn1.c
@@ -82,7 +82,6 @@ i2d_TS_MSG_IMPRINT_bio(BIO *bp, TS_MSG_IMPRINT *a)
 }
 #endif
 
-#ifndef OPENSSL_NO_FP_API
 TS_MSG_IMPRINT *
 d2i_TS_MSG_IMPRINT_fp(FILE *fp, TS_MSG_IMPRINT **a)
 {
@@ -95,7 +94,6 @@ i2d_TS_MSG_IMPRINT_fp(FILE *fp, TS_MSG_IMPRINT *a)
 {
         return ASN1_i2d_fp_of_const(TS_MSG_IMPRINT, i2d_TS_MSG_IMPRINT, fp, a);
 }
-#endif
 
 ASN1_SEQUENCE(TS_REQ) = {
         ASN1_SIMPLE(TS_REQ, version, ASN1_INTEGER),
@@ -123,7 +121,6 @@ i2d_TS_REQ_bio(BIO *bp, TS_REQ *a)
 }
 #endif
 
-#ifndef OPENSSL_NO_FP_API
 TS_REQ *
 d2i_TS_REQ_fp(FILE *fp, TS_REQ **a)
 {
@@ -135,7 +132,6 @@ i2d_TS_REQ_fp(FILE *fp, TS_REQ *a)
 {
         return ASN1_i2d_fp_of_const(TS_REQ, i2d_TS_REQ, fp, a);
 }
-#endif
 
 ASN1_SEQUENCE(TS_ACCURACY) = {
         ASN1_OPT(TS_ACCURACY, seconds, ASN1_INTEGER),
@@ -177,7 +173,6 @@ i2d_TS_TST_INFO_bio(BIO *bp, TS_TST_INFO *a)
 }
 #endif
 
-#ifndef OPENSSL_NO_FP_API
 TS_TST_INFO *
 d2i_TS_TST_INFO_fp(FILE *fp, TS_TST_INFO **a)
 {
@@ -190,7 +185,6 @@ i2d_TS_TST_INFO_fp(FILE *fp, TS_TST_INFO *a)
 {
         return ASN1_i2d_fp_of_const(TS_TST_INFO, i2d_TS_TST_INFO, fp, a);
 }
-#endif
 
 ASN1_SEQUENCE(TS_STATUS_INFO) = {
         ASN1_SIMPLE(TS_STATUS_INFO, status, ASN1_INTEGER),
@@ -268,7 +262,6 @@ i2d_TS_RESP_bio(BIO *bp, TS_RESP *a)
 }
 #endif
 
-#ifndef OPENSSL_NO_FP_API
 TS_RESP *
 d2i_TS_RESP_fp(FILE *fp, TS_RESP **a)
 {
@@ -280,7 +273,6 @@ i2d_TS_RESP_fp(FILE *fp, TS_RESP *a)
 {
         return ASN1_i2d_fp_of_const(TS_RESP, i2d_TS_RESP, fp, a);
 }
-#endif
 
 ASN1_SEQUENCE(ESS_ISSUER_SERIAL) = {
         ASN1_SEQUENCE_OF(ESS_ISSUER_SERIAL, issuer, GENERAL_NAME),
diff --git a/src/lib/libcrypto/x509/x509.h b/src/lib/libcrypto/x509/x509.h
index 6a29e4bd71..9ac1eddb2a 100644
--- a/src/lib/libcrypto/x509/x509.h
+++ b/src/lib/libcrypto/x509/x509.h
@@ -673,7 +673,6 @@ int X509_NAME_digest(const X509_NAME *data,const EVP_MD *type,
                 unsigned char *md, unsigned int *len);
 #endif
 
-#ifndef OPENSSL_NO_FP_API
 X509 *d2i_X509_fp(FILE *fp, X509 **x509);
 int i2d_X509_fp(FILE *fp,X509 *x509);
 X509_CRL *d2i_X509_CRL_fp(FILE *fp,X509_CRL **crl);
@@ -709,7 +708,6 @@ int i2d_PrivateKey_fp(FILE *fp, EVP_PKEY *pkey);
 EVP_PKEY *d2i_PrivateKey_fp(FILE *fp, EVP_PKEY **a);
 int i2d_PUBKEY_fp(FILE *fp, EVP_PKEY *pkey);
 EVP_PKEY *d2i_PUBKEY_fp(FILE *fp, EVP_PKEY **a);
-#endif
 
 #ifndef OPENSSL_NO_BIO
 X509 *d2i_X509_bio(BIO *bp,X509 **x509);
@@ -965,13 +963,11 @@ unsigned long	X509_NAME_hash_old(X509_NAME *x);
 
 int             X509_CRL_cmp(const X509_CRL *a, const X509_CRL *b);
 int             X509_CRL_match(const X509_CRL *a, const X509_CRL *b);
-#ifndef OPENSSL_NO_FP_API
 int             X509_print_ex_fp(FILE *bp,X509 *x, unsigned long nmflag, unsigned long cflag);
 int             X509_print_fp(FILE *bp,X509 *x);
 int             X509_CRL_print_fp(FILE *bp,X509_CRL *x);
 int             X509_REQ_print_fp(FILE *bp,X509_REQ *req);
 int X509_NAME_print_ex_fp(FILE *fp, X509_NAME *nm, int indent, unsigned long flags);
-#endif
 
 #ifndef OPENSSL_NO_BIO
 int             X509_NAME_print(BIO *bp, X509_NAME *name, int obase);
diff --git a/src/lib/libcrypto/x509/x_all.c b/src/lib/libcrypto/x509/x_all.c
index 92f80ca433..95d0777829 100644
--- a/src/lib/libcrypto/x509/x_all.c
+++ b/src/lib/libcrypto/x509/x_all.c
@@ -146,7 +146,6 @@ NETSCAPE_SPKI_sign(NETSCAPE_SPKI *x, EVP_PKEY *pkey, const EVP_MD *md)
             x->sig_algor, NULL, x->signature, x->spkac, pkey, md));
 }
 
-#ifndef OPENSSL_NO_FP_API
 X509 *
 d2i_X509_fp(FILE *fp, X509 **x509)
 {
@@ -158,7 +157,6 @@ i2d_X509_fp(FILE *fp, X509 *x509)
 {
         return ASN1_item_i2d_fp(ASN1_ITEM_rptr(X509), fp, x509);
 }
-#endif
 
 X509 *
 d2i_X509_bio(BIO *bp, X509 **x509)
@@ -172,7 +170,6 @@ i2d_X509_bio(BIO *bp, X509 *x509)
         return ASN1_item_i2d_bio(ASN1_ITEM_rptr(X509), bp, x509);
 }
 
-#ifndef OPENSSL_NO_FP_API
 X509_CRL *
 d2i_X509_CRL_fp(FILE *fp, X509_CRL **crl)
 {
@@ -184,7 +181,6 @@ i2d_X509_CRL_fp(FILE *fp, X509_CRL *crl)
 {
         return ASN1_item_i2d_fp(ASN1_ITEM_rptr(X509_CRL), fp, crl);
 }
-#endif
 
 X509_CRL *
 d2i_X509_CRL_bio(BIO *bp, X509_CRL **crl)
@@ -198,7 +194,6 @@ i2d_X509_CRL_bio(BIO *bp, X509_CRL *crl)
         return ASN1_item_i2d_bio(ASN1_ITEM_rptr(X509_CRL), bp, crl);
 }
 
-#ifndef OPENSSL_NO_FP_API
 PKCS7 *
 d2i_PKCS7_fp(FILE *fp, PKCS7 **p7)
 {
@@ -210,7 +205,6 @@ i2d_PKCS7_fp(FILE *fp, PKCS7 *p7)
 {
         return ASN1_item_i2d_fp(ASN1_ITEM_rptr(PKCS7), fp, p7);
 }
-#endif
 
 PKCS7 *
 d2i_PKCS7_bio(BIO *bp, PKCS7 **p7)
@@ -224,7 +218,6 @@ i2d_PKCS7_bio(BIO *bp, PKCS7 *p7)
         return ASN1_item_i2d_bio(ASN1_ITEM_rptr(PKCS7), bp, p7);
 }
 
-#ifndef OPENSSL_NO_FP_API
 X509_REQ *
 d2i_X509_REQ_fp(FILE *fp, X509_REQ **req)
 {
@@ -236,7 +229,6 @@ i2d_X509_REQ_fp(FILE *fp, X509_REQ *req)
 {
         return ASN1_item_i2d_fp(ASN1_ITEM_rptr(X509_REQ), fp, req);
 }
-#endif
 
 X509_REQ *
 d2i_X509_REQ_bio(BIO *bp, X509_REQ **req)
@@ -252,7 +244,6 @@ i2d_X509_REQ_bio(BIO *bp, X509_REQ *req)
 
 #ifndef OPENSSL_NO_RSA
 
-#ifndef OPENSSL_NO_FP_API
 RSA *
 d2i_RSAPrivateKey_fp(FILE *fp, RSA **rsa)
 {
@@ -290,7 +281,6 @@ i2d_RSA_PUBKEY_fp(FILE *fp, RSA *rsa)
 {
         return ASN1_i2d_fp((I2D_OF(void))i2d_RSA_PUBKEY, fp, rsa);
 }
-#endif
 
 RSA *
 d2i_RSAPrivateKey_bio(BIO *bp, RSA **rsa)
@@ -331,7 +321,6 @@ i2d_RSA_PUBKEY_bio(BIO *bp, RSA *rsa)
 #endif
 
 #ifndef OPENSSL_NO_DSA
-#ifndef OPENSSL_NO_FP_API
 DSA *
 d2i_DSAPrivateKey_fp(FILE *fp, DSA **dsa)
 {
@@ -355,7 +344,6 @@ i2d_DSA_PUBKEY_fp(FILE *fp, DSA *dsa)
 {
         return ASN1_i2d_fp_of(DSA, i2d_DSA_PUBKEY, fp, dsa);
 }
-#endif
 
 DSA *
 d2i_DSAPrivateKey_bio(BIO *bp, DSA **dsa)
@@ -384,7 +372,6 @@ i2d_DSA_PUBKEY_bio(BIO *bp, DSA *dsa)
 #endif
 
 #ifndef OPENSSL_NO_EC
-#ifndef OPENSSL_NO_FP_API
 EC_KEY *
 d2i_EC_PUBKEY_fp(FILE *fp, EC_KEY **eckey)
 {
@@ -408,7 +395,6 @@ i2d_ECPrivateKey_fp(FILE *fp, EC_KEY *eckey)
 {
         return ASN1_i2d_fp_of(EC_KEY, i2d_ECPrivateKey, fp, eckey);
 }
-#endif
 EC_KEY *
 d2i_EC_PUBKEY_bio(BIO *bp, EC_KEY **eckey)
 {
@@ -487,7 +473,6 @@ PKCS7_ISSUER_AND_SERIAL_digest(PKCS7_ISSUER_AND_SERIAL *data,
 }
 
 
-#ifndef OPENSSL_NO_FP_API
 X509_SIG *
 d2i_PKCS8_fp(FILE *fp, X509_SIG **p8)
 {
@@ -499,7 +484,6 @@ i2d_PKCS8_fp(FILE *fp, X509_SIG *p8)
 {
         return ASN1_i2d_fp_of(X509_SIG, i2d_X509_SIG, fp, p8);
 }
-#endif
 
 X509_SIG *
 d2i_PKCS8_bio(BIO *bp, X509_SIG **p8)
@@ -513,7 +497,6 @@ i2d_PKCS8_bio(BIO *bp, X509_SIG *p8)
         return ASN1_i2d_bio_of(X509_SIG, i2d_X509_SIG, bp, p8);
 }
 
-#ifndef OPENSSL_NO_FP_API
 PKCS8_PRIV_KEY_INFO *
 d2i_PKCS8_PRIV_KEY_INFO_fp(FILE *fp, PKCS8_PRIV_KEY_INFO **p8inf)
 {
@@ -566,7 +549,6 @@ d2i_PUBKEY_fp(FILE *fp, EVP_PKEY **a)
         return ASN1_d2i_fp_of(EVP_PKEY, EVP_PKEY_new, d2i_PUBKEY, fp, a);
 }
 
-#endif
 
 PKCS8_PRIV_KEY_INFO *
 d2i_PKCS8_PRIV_KEY_INFO_bio(BIO *bp, PKCS8_PRIV_KEY_INFO **p8inf)
diff --git a/src/lib/libcrypto/x509v3/v3_prn.c b/src/lib/libcrypto/x509v3/v3_prn.c
index 3874ded51c..ff08534f9a 100644
--- a/src/lib/libcrypto/x509v3/v3_prn.c
+++ b/src/lib/libcrypto/x509v3/v3_prn.c
@@ -212,7 +212,6 @@ unknown_ext_print(BIO *out, X509_EXTENSION *ext, unsigned long flag,
 }
 
 
-#ifndef OPENSSL_NO_FP_API
 int
 X509V3_EXT_print_fp(FILE *fp, X509_EXTENSION *ext, int flag, int indent)
 {
@@ -225,4 +224,3 @@ X509V3_EXT_print_fp(FILE *fp, X509_EXTENSION *ext, int flag, int indent)
         BIO_free(bio_tmp);
         return ret;
 }
-#endif
diff --git a/src/lib/libssl/src/crypto/asn1/a_d2i_fp.c b/src/lib/libssl/src/crypto/asn1/a_d2i_fp.c
index af7a4bac30..a31dc35649 100644
--- a/src/lib/libssl/src/crypto/asn1/a_d2i_fp.c
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/asn1/a_i2d_fp.c b/src/lib/libssl/src/crypto/asn1/a_i2d_fp.c
index 007e612b4a..b9d066754b 100644
--- a/src/lib/libssl/src/crypto/asn1/a_i2d_fp.c
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/asn1/a_strex.c b/src/lib/libssl/src/crypto/asn1/a_strex.c
index 684e933c4f..dcdd9d0f14 100644
--- a/src/lib/libssl/src/crypto/asn1/a_strex.c
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/asn1/asn1.h b/src/lib/libssl/src/crypto/asn1/asn1.h
index 6543e5aafe..be417bb7eb 100644
--- a/src/lib/libssl/src/crypto/asn1/asn1.h
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/asn1/t_crl.c b/src/lib/libssl/src/crypto/asn1/t_crl.c
index cd1ed26174..ab4a8c60d2 100644
--- a/src/lib/libssl/src/crypto/asn1/t_crl.c
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/asn1/t_req.c b/src/lib/libssl/src/crypto/asn1/t_req.c
index 331440bed5..78f06950cc 100644
--- a/src/lib/libssl/src/crypto/asn1/t_req.c
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/asn1/t_x509.c b/src/lib/libssl/src/crypto/asn1/t_x509.c
index 81333d67cf..efba93adeb 100644
--- a/src/lib/libssl/src/crypto/asn1/t_x509.c
+++ b/src/lib/libssl/src/crypto/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)
diff --git a/src/lib/libssl/src/crypto/bio/b_dump.c b/src/lib/libssl/src/crypto/bio/b_dump.c
index 65238299f2..d4750f66be 100644
--- a/src/lib/libssl/src/crypto/bio/b_dump.c
+++ b/src/lib/libssl/src/crypto/bio/b_dump.c
@@ -147,7 +147,6 @@ BIO_dump_indent_cb(int (*cb)(const void *data, size_t len, void *u),
         return (ret);
 }
 
-#ifndef OPENSSL_NO_FP_API
 static int
 write_fp(const void *data, size_t len, void *fp)
 {
@@ -165,7 +164,6 @@ BIO_dump_indent_fp(FILE *fp, const char *s, int len, int indent)
 {
         return BIO_dump_indent_cb(write_fp, fp, s, len, indent);
 }
-#endif
 
 static int
 write_bio(const void *data, size_t len, void *bp)
diff --git a/src/lib/libssl/src/crypto/bio/bio.h b/src/lib/libssl/src/crypto/bio/bio.h
index 67574d9fa4..6809b70e9d 100644
--- a/src/lib/libssl/src/crypto/bio/bio.h
+++ b/src/lib/libssl/src/crypto/bio/bio.h
@@ -61,9 +61,7 @@
 
 #include <openssl/opensslconf.h>
 
-#ifndef OPENSSL_NO_FP_API
 # include <stdio.h>
-#endif
 #include <stdarg.h>
 
 #include <openssl/crypto.h>
@@ -619,12 +617,10 @@ int
 BIO_asn1_get_suffix(BIO *b, asn1_ps_func **psuffix,
 asn1_ps_func **psuffix_free);
 
-# ifndef OPENSSL_NO_FP_API
 BIO_METHOD *BIO_s_file(void );
 BIO *BIO_new_file(const char *filename, const char *mode);
 BIO *BIO_new_fp(FILE *stream, int close_flag);
 # define BIO_s_file_internal    BIO_s_file
-# endif
 BIO *   BIO_new(BIO_METHOD *type);
 int     BIO_set(BIO *a, BIO_METHOD *type);
 int     BIO_free(BIO *a);
@@ -694,10 +690,8 @@ BIO_dump_indent_cb(int (*cb)(const void *data, size_t len, void *u),
 void *u, const char *s, int len, int indent);
 int BIO_dump(BIO *b, const char *bytes, int len);
 int BIO_dump_indent(BIO *b, const char *bytes, int len, int indent);
-#ifndef OPENSSL_NO_FP_API
 int BIO_dump_fp(FILE *fp, const char *s, int len);
 int BIO_dump_indent_fp(FILE *fp, const char *s, int len, int indent);
-#endif
 struct hostent *BIO_gethostbyname(const char *name);
 /* We might want a thread-safe interface too:
  * struct hostent *BIO_gethostbyname_r(const char *name,
diff --git a/src/lib/libssl/src/crypto/bn/bn.h b/src/lib/libssl/src/crypto/bn/bn.h
index ce04c4d217..5d2f13877e 100644
--- a/src/lib/libssl/src/crypto/bn/bn.h
+++ b/src/lib/libssl/src/crypto/bn/bn.h
@@ -127,9 +127,7 @@
 
 #include <openssl/opensslconf.h>
 
-#ifndef OPENSSL_NO_FP_API
 #include <stdio.h> /* FILE */
-#endif
 #include <openssl/ossl_typ.h>
 #include <openssl/crypto.h>
 
@@ -442,9 +440,7 @@ int	BN_mod_exp_simple(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
     const BIGNUM *m, BN_CTX *ctx);
 
 int     BN_mask_bits(BIGNUM *a, int n);
-#ifndef OPENSSL_NO_FP_API
 int     BN_print_fp(FILE *fp, const BIGNUM *a);
-#endif
 #ifdef HEADER_BIO_H
 int     BN_print(BIO *fp, const BIGNUM *a);
 #else
diff --git a/src/lib/libssl/src/crypto/bn/bn_print.c b/src/lib/libssl/src/crypto/bn/bn_print.c
index c09c64db25..3a0fb25369 100644
--- a/src/lib/libssl/src/crypto/bn/bn_print.c
+++ b/src/lib/libssl/src/crypto/bn/bn_print.c
@@ -328,7 +328,6 @@ BN_asc2bn(BIGNUM **bn, const char *a)
 }
 
 #ifndef OPENSSL_NO_BIO
-#ifndef OPENSSL_NO_FP_API
 int
 BN_print_fp(FILE *fp, const BIGNUM *a)
 {
@@ -342,7 +341,6 @@ BN_print_fp(FILE *fp, const BIGNUM *a)
         BIO_free(b);
         return (ret);
 }
-#endif
 
 int
 BN_print(BIO *bp, const BIGNUM *a)
diff --git a/src/lib/libssl/src/crypto/conf/conf.h b/src/lib/libssl/src/crypto/conf/conf.h
index 00efc12120..c54f87dca2 100644
--- a/src/lib/libssl/src/crypto/conf/conf.h
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/conf/conf_lib.c b/src/lib/libssl/src/crypto/conf/conf_lib.c
index 35bdda3d64..164e9bebf8 100644
--- a/src/lib/libssl/src/crypto/conf/conf_lib.c
+++ b/src/lib/libssl/src/crypto/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)
diff --git a/src/lib/libssl/src/crypto/crypto.h b/src/lib/libssl/src/crypto/crypto.h
index 9307687b27..e3cf3ec7a9 100644
--- a/src/lib/libssl/src/crypto/crypto.h
+++ b/src/lib/libssl/src/crypto/crypto.h
@@ -121,9 +121,7 @@
 
 #include <openssl/opensslconf.h>
 
-#ifndef OPENSSL_NO_FP_API
 #include <stdio.h>
-#endif
 
 #include <openssl/stack.h>
 #include <openssl/safestack.h>
@@ -516,9 +514,7 @@ void CRYPTO_dbg_set_options(long bits);
 long CRYPTO_dbg_get_options(void);
 
 
-#ifndef OPENSSL_NO_FP_API
 void CRYPTO_mem_leaks_fp(FILE *);
-#endif
 void CRYPTO_mem_leaks(struct bio_st *bio);
 /* unsigned long order, char *file, int line, int num_bytes, char *addr */
 typedef void *CRYPTO_MEM_LEAK_CB(unsigned long, const char *, int, int, void *);
diff --git a/src/lib/libssl/src/crypto/dh/dh.h b/src/lib/libssl/src/crypto/dh/dh.h
index 36ca149b73..0d313ea9b4 100644
--- a/src/lib/libssl/src/crypto/dh/dh.h
+++ b/src/lib/libssl/src/crypto/dh/dh.h
@@ -212,9 +212,7 @@ int	DH_generate_key(DH *dh);
 int     DH_compute_key(unsigned char *key,const BIGNUM *pub_key,DH *dh);
 DH *    d2i_DHparams(DH **a,const unsigned char **pp, long length);
 int     i2d_DHparams(const DH *a,unsigned char **pp);
-#ifndef OPENSSL_NO_FP_API
 int     DHparams_print_fp(FILE *fp, const DH *x);
-#endif
 #ifndef OPENSSL_NO_BIO
 int     DHparams_print(BIO *bp, const DH *x);
 #else
diff --git a/src/lib/libssl/src/crypto/dh/dh_prn.c b/src/lib/libssl/src/crypto/dh/dh_prn.c
index ae58c2ac87..9745798628 100644
--- a/src/lib/libssl/src/crypto/dh/dh_prn.c
+++ b/src/lib/libssl/src/crypto/dh/dh_prn.c
@@ -61,7 +61,6 @@
 #include <openssl/evp.h>
 #include <openssl/dh.h>
 
-#ifndef OPENSSL_NO_FP_API
 int DHparams_print_fp(FILE *fp, const DH *x)
         {
         BIO *b;
@@ -77,4 +76,3 @@ int DHparams_print_fp(FILE *fp, const DH *x)
         BIO_free(b);
         return(ret);
         }
-#endif
diff --git a/src/lib/libssl/src/crypto/dsa/dsa.h b/src/lib/libssl/src/crypto/dsa/dsa.h
index c871499201..48f7f8196e 100644
--- a/src/lib/libssl/src/crypto/dsa/dsa.h
+++ b/src/lib/libssl/src/crypto/dsa/dsa.h
@@ -247,10 +247,8 @@ int	i2d_DSAparams(const DSA *a,unsigned char **pp);
 int     DSAparams_print(BIO *bp, const DSA *x);
 int     DSA_print(BIO *bp, const DSA *x, int off);
 #endif
-#ifndef OPENSSL_NO_FP_API
 int     DSAparams_print_fp(FILE *fp, const DSA *x);
 int     DSA_print_fp(FILE *bp, const DSA *x, int off);
-#endif
 
 #define DSS_prime_checks 50
 /* Primality test according to FIPS PUB 186[-1], Appendix 2.1:
diff --git a/src/lib/libssl/src/crypto/dsa/dsa_prn.c b/src/lib/libssl/src/crypto/dsa/dsa_prn.c
index 6f29f5e240..638f541975 100644
--- a/src/lib/libssl/src/crypto/dsa/dsa_prn.c
+++ b/src/lib/libssl/src/crypto/dsa/dsa_prn.c
@@ -61,7 +61,6 @@
 #include <openssl/evp.h>
 #include <openssl/dsa.h>
 
-#ifndef OPENSSL_NO_FP_API
 int DSA_print_fp(FILE *fp, const DSA *x, int off)
         {
         BIO *b;
@@ -93,7 +92,6 @@ int DSAparams_print_fp(FILE *fp, const DSA *x)
         BIO_free(b);
         return(ret);
         }
-#endif
 
 int DSA_print(BIO *bp, const DSA *x, int off)
         {
diff --git a/src/lib/libssl/src/crypto/ec/ec.h b/src/lib/libssl/src/crypto/ec/ec.h
index 86f8c6820d..1e0b929304 100644
--- a/src/lib/libssl/src/crypto/ec/ec.h
+++ b/src/lib/libssl/src/crypto/ec/ec.h
@@ -695,9 +695,7 @@ int i2d_ECPKParameters(const EC_GROUP *, unsigned char **out);
 #ifndef OPENSSL_NO_BIO
 int     ECPKParameters_print(BIO *bp, const EC_GROUP *x, int off);
 #endif
-#ifndef OPENSSL_NO_FP_API
 int     ECPKParameters_print_fp(FILE *fp, const EC_GROUP *x, int off);
-#endif
 
 
 /********************************************************************/
@@ -930,7 +928,6 @@ int	ECParameters_print(BIO *bp, const EC_KEY *key);
 int     EC_KEY_print(BIO *bp, const EC_KEY *key, int off);
 
 #endif
-#ifndef OPENSSL_NO_FP_API
 /** Prints out the ec parameters on human readable form.
  *  \param  fp   file descriptor to which the information is printed
  *  \param  key  EC_KEY object
@@ -946,7 +943,6 @@ int	ECParameters_print_fp(FILE *fp, const EC_KEY *key);
  */
 int     EC_KEY_print_fp(FILE *fp, const EC_KEY *key, int off);
 
-#endif
 
 #define ECParameters_dup(x) ASN1_dup_of(EC_KEY,i2d_ECParameters,d2i_ECParameters,x)
 
diff --git a/src/lib/libssl/src/crypto/ec/eck_prn.c b/src/lib/libssl/src/crypto/ec/eck_prn.c
index 86107d5142..3f2973e5b6 100644
--- a/src/lib/libssl/src/crypto/ec/eck_prn.c
+++ b/src/lib/libssl/src/crypto/ec/eck_prn.c
@@ -67,7 +67,6 @@
 #include <openssl/ec.h>
 #include <openssl/bn.h>
 
-#ifndef OPENSSL_NO_FP_API
 int 
 ECPKParameters_print_fp(FILE * fp, const EC_GROUP * x, int off)
 {
@@ -115,7 +114,6 @@ ECParameters_print_fp(FILE * fp, const EC_KEY * x)
         BIO_free(b);
         return (ret);
 }
-#endif
 
 int 
 EC_KEY_print(BIO * bp, const EC_KEY * x, int off)
diff --git a/src/lib/libssl/src/crypto/err/err.h b/src/lib/libssl/src/crypto/err/err.h
index 601f56a624..0396aba726 100644
--- a/src/lib/libssl/src/crypto/err/err.h
+++ b/src/lib/libssl/src/crypto/err/err.h
@@ -114,10 +114,8 @@
 
 #include <openssl/opensslconf.h>
 
-#ifndef OPENSSL_NO_FP_API
 #include <stdio.h>
 #include <stdlib.h>
-#endif
 
 #include <openssl/ossl_typ.h>
 #ifndef OPENSSL_NO_BIO
@@ -337,9 +335,7 @@ const char *ERR_func_error_string(unsigned long e);
 const char *ERR_reason_error_string(unsigned long e);
 void ERR_print_errors_cb(int (*cb)(const char *str, size_t len, void *u),
     void *u);
-#ifndef OPENSSL_NO_FP_API
 void ERR_print_errors_fp(FILE *fp);
-#endif
 #ifndef OPENSSL_NO_BIO
 void ERR_print_errors(BIO *bp);
 #endif
diff --git a/src/lib/libssl/src/crypto/err/err_prn.c b/src/lib/libssl/src/crypto/err/err_prn.c
index d6b488fee9..7790287a3f 100644
--- a/src/lib/libssl/src/crypto/err/err_prn.c
+++ b/src/lib/libssl/src/crypto/err/err_prn.c
@@ -86,7 +86,6 @@ ERR_print_errors_cb(int (*cb)(const char *str, size_t len, void *u), void *u)
         }
 }
 
-#ifndef OPENSSL_NO_FP_API
 static int
 print_fp(const char *str, size_t len, void *fp)
 {
@@ -103,7 +102,6 @@ ERR_print_errors_fp(FILE *fp)
 {
         ERR_print_errors_cb(print_fp, fp);
 }
-#endif
 
 static int
 print_bio(const char *str, size_t len, void *bp)
diff --git a/src/lib/libssl/src/crypto/lhash/lh_stats.c b/src/lib/libssl/src/crypto/lhash/lh_stats.c
index 34c7d77cb1..4676d9810d 100644
--- a/src/lib/libssl/src/crypto/lhash/lh_stats.c
+++ b/src/lib/libssl/src/crypto/lhash/lh_stats.c
@@ -140,7 +140,6 @@ lh_node_usage_stats(LHASH *lh, FILE *out)
 
 #else
 
-#ifndef OPENSSL_NO_FP_API
 void
 lh_stats(const _LHASH *lh, FILE *fp)
 {
@@ -183,7 +182,6 @@ lh_node_usage_stats(const _LHASH *lh, FILE *fp)
 end:;
 }
 
-#endif
 
 void
 lh_stats_bio(const _LHASH *lh, BIO *out)
diff --git a/src/lib/libssl/src/crypto/lhash/lhash.h b/src/lib/libssl/src/crypto/lhash/lhash.h
index 187a284243..8147417cd8 100644
--- a/src/lib/libssl/src/crypto/lhash/lhash.h
+++ b/src/lib/libssl/src/crypto/lhash/lhash.h
@@ -65,9 +65,7 @@
 
 #include <openssl/opensslconf.h>
 
-#ifndef OPENSSL_NO_FP_API
 #include <stdio.h>
-#endif
 
 #ifndef OPENSSL_NO_BIO
 #include <openssl/bio.h>
@@ -181,11 +179,9 @@ void lh_doall_arg(_LHASH *lh, LHASH_DOALL_ARG_FN_TYPE func, void *arg);
 unsigned long lh_strhash(const char *c);
 unsigned long lh_num_items(const _LHASH *lh);
 
-#ifndef OPENSSL_NO_FP_API
 void lh_stats(const _LHASH *lh, FILE *out);
 void lh_node_stats(const _LHASH *lh, FILE *out);
 void lh_node_usage_stats(const _LHASH *lh, FILE *out);
-#endif
 
 #ifndef OPENSSL_NO_BIO
 void lh_stats_bio(const _LHASH *lh, BIO *out);
diff --git a/src/lib/libssl/src/crypto/mem_dbg.c b/src/lib/libssl/src/crypto/mem_dbg.c
index 4337c52774..288ee907c3 100644
--- a/src/lib/libssl/src/crypto/mem_dbg.c
+++ b/src/lib/libssl/src/crypto/mem_dbg.c
@@ -187,13 +187,11 @@ CRYPTO_mem_leaks(BIO *b)
         return;
 }
 
-#ifndef OPENSSL_NO_FP_API
 void
 CRYPTO_mem_leaks_fp(FILE *fp)
 {
         return;
 }
-#endif
 
 
 void
diff --git a/src/lib/libssl/src/crypto/pem/pem.h b/src/lib/libssl/src/crypto/pem/pem.h
index 6eae9345a1..daf5b1375d 100644
--- a/src/lib/libssl/src/crypto/pem/pem.h
+++ b/src/lib/libssl/src/crypto/pem/pem.h
@@ -206,15 +206,6 @@ typedef struct pem_ctx_st {
  * IMPLEMENT_PEM_rw(...) or IMPLEMENT_PEM_rw_cb(...)
  */
 
-#ifdef OPENSSL_NO_FP_API
-
-#define IMPLEMENT_PEM_read_fp(name, type, str, asn1) /**/
-#define IMPLEMENT_PEM_write_fp(name, type, str, asn1) /**/
-#define IMPLEMENT_PEM_write_fp_const(name, type, str, asn1) /**/
-#define IMPLEMENT_PEM_write_cb_fp(name, type, str, asn1) /**/
-#define IMPLEMENT_PEM_write_cb_fp_const(name, type, str, asn1) /**/
-
-#else
 
 #define IMPLEMENT_PEM_read_fp(name, type, str, asn1) \
 type *PEM_read_##name(FILE *fp, type **x, pem_password_cb *cb, void *u)\
@@ -250,7 +241,6 @@ int PEM_write_##name(FILE *fp, type *x, const EVP_CIPHER *enc, \
         return PEM_ASN1_write((i2d_of_void *)i2d_##asn1,str,fp,x,enc,kstr,klen,cb,u); \
         }
 
-#endif
 
 #define IMPLEMENT_PEM_read_bio(name, type, str, asn1) \
 type *PEM_read_bio_##name(BIO *bp, type **x, pem_password_cb *cb, void *u)\
@@ -318,13 +308,6 @@ int PEM_write_bio_##name(BIO *bp, type *x, const EVP_CIPHER *enc, \
 
 /* These are the same except they are for the declarations */
 
-#if defined(OPENSSL_NO_FP_API)
-
-#define DECLARE_PEM_read_fp(name, type) /**/
-#define DECLARE_PEM_write_fp(name, type) /**/
-#define DECLARE_PEM_write_cb_fp(name, type) /**/
-
-#else
 
 #define DECLARE_PEM_read_fp(name, type) \
         type *PEM_read_##name(FILE *fp, type **x, pem_password_cb *cb, void *u);
@@ -339,7 +322,6 @@ int PEM_write_bio_##name(BIO *bp, type *x, const EVP_CIPHER *enc, \
         int PEM_write_##name(FILE *fp, type *x, const EVP_CIPHER *enc, \
              unsigned char *kstr, int klen, pem_password_cb *cb, void *u);
 
-#endif
 
 #ifndef OPENSSL_NO_BIO
 #define DECLARE_PEM_read_bio(name, type) \
diff --git a/src/lib/libssl/src/crypto/pem/pem_all.c b/src/lib/libssl/src/crypto/pem/pem_all.c
index 8b54d1a698..2cca8fbc39 100644
--- a/src/lib/libssl/src/crypto/pem/pem_all.c
+++ b/src/lib/libssl/src/crypto/pem/pem_all.c
@@ -186,7 +186,6 @@ PEM_read_bio_RSAPrivateKey(BIO *bp, RSA **rsa, pem_password_cb *cb, void *u)
         return pkey_get_rsa(pktmp, rsa);
 }
 
-#ifndef OPENSSL_NO_FP_API
 
 RSA *
 PEM_read_RSAPrivateKey(FILE *fp, RSA **rsa, pem_password_cb *cb, void *u)
@@ -197,7 +196,6 @@ PEM_read_RSAPrivateKey(FILE *fp, RSA **rsa, pem_password_cb *cb, void *u)
         return pkey_get_rsa(pktmp, rsa);
 }
 
-#endif
 
 IMPLEMENT_PEM_write_cb_const(RSAPrivateKey, RSA, PEM_STRING_RSA, RSAPrivateKey)
 
@@ -239,7 +237,6 @@ IMPLEMENT_PEM_write_cb_const(DSAPrivateKey, DSA, PEM_STRING_DSA, DSAPrivateKey)
 
 IMPLEMENT_PEM_rw(DSA_PUBKEY, DSA, PEM_STRING_PUBLIC, DSA_PUBKEY)
 
-#ifndef OPENSSL_NO_FP_API
 
 DSA *
 PEM_read_DSAPrivateKey(FILE *fp, DSA **dsa, pem_password_cb *cb, void *u)
@@ -250,7 +247,6 @@ PEM_read_DSAPrivateKey(FILE *fp, DSA **dsa, pem_password_cb *cb, void *u)
         return pkey_get_dsa(pktmp, dsa);        /* will free pktmp */
 }
 
-#endif
 
 IMPLEMENT_PEM_rw_const(DSAparams, DSA, PEM_STRING_DSAPARAMS, DSAparams)
 
@@ -292,7 +288,6 @@ IMPLEMENT_PEM_write_cb(ECPrivateKey, EC_KEY, PEM_STRING_ECPRIVATEKEY,
 
 IMPLEMENT_PEM_rw(EC_PUBKEY, EC_KEY, PEM_STRING_PUBLIC, EC_PUBKEY)
 
-#ifndef OPENSSL_NO_FP_API
 
 EC_KEY *
 PEM_read_ECPrivateKey(FILE *fp, EC_KEY **eckey, pem_password_cb *cb, void *u)
@@ -303,7 +298,6 @@ PEM_read_ECPrivateKey(FILE *fp, EC_KEY **eckey, pem_password_cb *cb, void *u)
         return pkey_get_eckey(pktmp, eckey);    /* will free pktmp */
 }
 
-#endif
 
 #endif
 
diff --git a/src/lib/libssl/src/crypto/pem/pem_info.c b/src/lib/libssl/src/crypto/pem/pem_info.c
index 967d6d2d41..40600e30f3 100644
--- a/src/lib/libssl/src/crypto/pem/pem_info.c
+++ b/src/lib/libssl/src/crypto/pem/pem_info.c
@@ -70,7 +70,6 @@
 #include <openssl/dsa.h>
 #endif
 
-#ifndef OPENSSL_NO_FP_API
 STACK_OF(X509_INFO) *
 PEM_X509_INFO_read(FILE *fp, STACK_OF(X509_INFO) *sk, pem_password_cb *cb,
     void *u)
@@ -87,7 +86,6 @@ PEM_X509_INFO_read(FILE *fp, STACK_OF(X509_INFO) *sk, pem_password_cb *cb,
         BIO_free(b);
         return (ret);
 }
-#endif
 
 STACK_OF(X509_INFO) *
 PEM_X509_INFO_read_bio(BIO *bp, STACK_OF(X509_INFO) *sk, pem_password_cb *cb,
diff --git a/src/lib/libssl/src/crypto/pem/pem_lib.c b/src/lib/libssl/src/crypto/pem/pem_lib.c
index 9bc2b27285..58d2bfbee9 100644
--- a/src/lib/libssl/src/crypto/pem/pem_lib.c
+++ b/src/lib/libssl/src/crypto/pem/pem_lib.c
@@ -85,12 +85,6 @@ int pem_check_suffix(const char *pem_str, const char *suffix);
 int
 PEM_def_callback(char *buf, int num, int w, void *key)
 {
-#ifdef OPENSSL_NO_FP_API
-        /* We should not ever call the default callback routine from
-         * windows. */
-        PEMerr(PEM_F_PEM_DEF_CALLBACK, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
-        return (-1);
-#else
         int i, j;
         const char *prompt;
 
@@ -120,7 +114,6 @@ PEM_def_callback(char *buf, int num, int w, void *key)
                         break;
         }
         return (j);
-#endif
 }
 
 void
@@ -163,7 +156,6 @@ PEM_dek_info(char *buf, const char *type, int len, char *str)
         buf[j + i * 2 + 1] = '\0';
 }
 
-#ifndef OPENSSL_NO_FP_API
 void *
 PEM_ASN1_read(d2i_of_void *d2i, const char *name, FILE *fp, void **x,
     pem_password_cb *cb, void *u)
@@ -180,7 +172,6 @@ PEM_ASN1_read(d2i_of_void *d2i, const char *name, FILE *fp, void **x,
         BIO_free(b);
         return (ret);
 }
-#endif
 
 static int
 check_pem(const char *nm, const char *name)
@@ -320,7 +311,6 @@ err:
         return ret;
 }
 
-#ifndef OPENSSL_NO_FP_API
 int
 PEM_ASN1_write(i2d_of_void *i2d, const char *name, FILE *fp, void *x,
     const EVP_CIPHER *enc, unsigned char *kstr, int klen,
@@ -338,7 +328,6 @@ PEM_ASN1_write(i2d_of_void *i2d, const char *name, FILE *fp, void *x,
         BIO_free(b);
         return (ret);
 }
-#endif
 
 int
 PEM_ASN1_write_bio(i2d_of_void *i2d, const char *name, BIO *bp, void *x,
@@ -576,7 +565,6 @@ load_iv(char **fromp, unsigned char *to, int num)
         return (1);
 }
 
-#ifndef OPENSSL_NO_FP_API
 int
 PEM_write(FILE *fp, char *name, char *header, unsigned char *data, long len)
 {
@@ -592,7 +580,6 @@ PEM_write(FILE *fp, char *name, char *header, unsigned char *data, long len)
         BIO_free(b);
         return (ret);
 }
-#endif
 
 int
 PEM_write_bio(BIO *bp, const char *name, char *header, unsigned char *data,
@@ -655,7 +642,6 @@ err:
         return (0);
 }
 
-#ifndef OPENSSL_NO_FP_API
 int
 PEM_read(FILE *fp, char **name, char **header, unsigned char **data, long *len)
 {
@@ -671,7 +657,6 @@ PEM_read(FILE *fp, char **name, char **header, unsigned char **data, long *len)
         BIO_free(b);
         return (ret);
 }
-#endif
 
 int
 PEM_read_bio(BIO *bp, char **name, char **header, unsigned char **data,
diff --git a/src/lib/libssl/src/crypto/pem/pem_pk8.c b/src/lib/libssl/src/crypto/pem/pem_pk8.c
index 228ecfceaf..2e0a44d4b8 100644
--- a/src/lib/libssl/src/crypto/pem/pem_pk8.c
+++ b/src/lib/libssl/src/crypto/pem/pem_pk8.c
@@ -190,7 +190,6 @@ d2i_PKCS8PrivateKey_bio(BIO *bp, EVP_PKEY **x, pem_password_cb *cb, void *u)
         return ret;
 }
 
-#ifndef OPENSSL_NO_FP_API
 
 int
 i2d_PKCS8PrivateKey_fp(FILE *fp, EVP_PKEY *x, const EVP_CIPHER *enc,
@@ -251,7 +250,6 @@ d2i_PKCS8PrivateKey_fp(FILE *fp, EVP_PKEY **x, pem_password_cb *cb, void *u)
         return ret;
 }
 
-#endif
 
 IMPLEMENT_PEM_rw(PKCS8, X509_SIG, PEM_STRING_PKCS8, X509_SIG)
 IMPLEMENT_PEM_rw(PKCS8_PRIV_KEY_INFO, PKCS8_PRIV_KEY_INFO, PEM_STRING_PKCS8INF,
diff --git a/src/lib/libssl/src/crypto/pem/pem_pkey.c b/src/lib/libssl/src/crypto/pem/pem_pkey.c
index bcce39281e..843ade927a 100644
--- a/src/lib/libssl/src/crypto/pem/pem_pkey.c
+++ b/src/lib/libssl/src/crypto/pem/pem_pkey.c
@@ -217,7 +217,6 @@ PEM_write_bio_Parameters(BIO *bp, EVP_PKEY *x)
             pem_str, bp, x, NULL, NULL, 0, 0, NULL);
 }
 
-#ifndef OPENSSL_NO_FP_API
 EVP_PKEY *
 PEM_read_PrivateKey(FILE *fp, EVP_PKEY **x, pem_password_cb *cb, void *u)
 {
@@ -250,4 +249,3 @@ PEM_write_PrivateKey(FILE *fp, EVP_PKEY *x, const EVP_CIPHER *enc,
         return ret;
 }
 
-#endif
diff --git a/src/lib/libssl/src/crypto/pkcs12/p12_utl.c b/src/lib/libssl/src/crypto/pkcs12/p12_utl.c
index 9c58036169..ec3dcb84fd 100644
--- a/src/lib/libssl/src/crypto/pkcs12/p12_utl.c
+++ b/src/lib/libssl/src/crypto/pkcs12/p12_utl.c
@@ -100,23 +100,19 @@ int i2d_PKCS12_bio(BIO *bp, PKCS12 *p12)
         return ASN1_item_i2d_bio(ASN1_ITEM_rptr(PKCS12), bp, p12);
 }
 
-#ifndef OPENSSL_NO_FP_API
 int i2d_PKCS12_fp(FILE *fp, PKCS12 *p12)
 {
         return ASN1_item_i2d_fp(ASN1_ITEM_rptr(PKCS12), fp, p12);
 }
-#endif
 
 PKCS12 *d2i_PKCS12_bio(BIO *bp, PKCS12 **p12)
 {
         return ASN1_item_d2i_bio(ASN1_ITEM_rptr(PKCS12), bp, p12);
 }
-#ifndef OPENSSL_NO_FP_API
 PKCS12 *d2i_PKCS12_fp(FILE *fp, PKCS12 **p12)
 {
         return ASN1_item_d2i_fp(ASN1_ITEM_rptr(PKCS12), fp, p12);
 }
-#endif
 
 PKCS12_SAFEBAG *PKCS12_x5092certbag(X509 *x509)
 {
diff --git a/src/lib/libssl/src/crypto/pkcs7/pkcs7.h b/src/lib/libssl/src/crypto/pkcs7/pkcs7.h
index a1220aba00..fa4a19dab0 100644
--- a/src/lib/libssl/src/crypto/pkcs7/pkcs7.h
+++ b/src/lib/libssl/src/crypto/pkcs7/pkcs7.h
@@ -273,10 +273,8 @@ DECLARE_ASN1_FUNCTIONS(PKCS7_ISSUER_AND_SERIAL)
 
 int PKCS7_ISSUER_AND_SERIAL_digest(PKCS7_ISSUER_AND_SERIAL *data,const EVP_MD *type,
         unsigned char *md,unsigned int *len);
-#ifndef OPENSSL_NO_FP_API
 PKCS7 *d2i_PKCS7_fp(FILE *fp,PKCS7 **p7);
 int i2d_PKCS7_fp(FILE *fp,PKCS7 *p7);
-#endif
 PKCS7 *PKCS7_dup(PKCS7 *p7);
 PKCS7 *d2i_PKCS7_bio(BIO *bp,PKCS7 **p7);
 int i2d_PKCS7_bio(BIO *bp,PKCS7 *p7);
diff --git a/src/lib/libssl/src/crypto/rsa/rsa.h b/src/lib/libssl/src/crypto/rsa/rsa.h
index 5f269e577a..2b78d58bb6 100644
--- a/src/lib/libssl/src/crypto/rsa/rsa.h
+++ b/src/lib/libssl/src/crypto/rsa/rsa.h
@@ -333,9 +333,7 @@ typedef struct rsa_pss_params_st
 
 DECLARE_ASN1_FUNCTIONS(RSA_PSS_PARAMS)
 
-#ifndef OPENSSL_NO_FP_API
 int     RSA_print_fp(FILE *fp, const RSA *r,int offset);
-#endif
 
 #ifndef OPENSSL_NO_BIO
 int     RSA_print(BIO *bp, const RSA *r,int offset);
diff --git a/src/lib/libssl/src/crypto/rsa/rsa_prn.c b/src/lib/libssl/src/crypto/rsa/rsa_prn.c
index 224db0fae5..c0e75065f0 100644
--- a/src/lib/libssl/src/crypto/rsa/rsa_prn.c
+++ b/src/lib/libssl/src/crypto/rsa/rsa_prn.c
@@ -61,7 +61,6 @@
 #include <openssl/rsa.h>
 #include <openssl/evp.h>
 
-#ifndef OPENSSL_NO_FP_API
 int RSA_print_fp(FILE *fp, const RSA *x, int off)
         {
         BIO *b;
@@ -77,7 +76,6 @@ int RSA_print_fp(FILE *fp, const RSA *x, int off)
         BIO_free(b);
         return(ret);
         }
-#endif
 
 int RSA_print(BIO *bp, const RSA *x, int off)
         {
diff --git a/src/lib/libssl/src/crypto/ts/ts_asn1.c b/src/lib/libssl/src/crypto/ts/ts_asn1.c
index 9e16b01f93..b5dc453510 100644
--- a/src/lib/libssl/src/crypto/ts/ts_asn1.c
+++ b/src/lib/libssl/src/crypto/ts/ts_asn1.c
@@ -82,7 +82,6 @@ i2d_TS_MSG_IMPRINT_bio(BIO *bp, TS_MSG_IMPRINT *a)
 }
 #endif
 
-#ifndef OPENSSL_NO_FP_API
 TS_MSG_IMPRINT *
 d2i_TS_MSG_IMPRINT_fp(FILE *fp, TS_MSG_IMPRINT **a)
 {
@@ -95,7 +94,6 @@ i2d_TS_MSG_IMPRINT_fp(FILE *fp, TS_MSG_IMPRINT *a)
 {
         return ASN1_i2d_fp_of_const(TS_MSG_IMPRINT, i2d_TS_MSG_IMPRINT, fp, a);
 }
-#endif
 
 ASN1_SEQUENCE(TS_REQ) = {
         ASN1_SIMPLE(TS_REQ, version, ASN1_INTEGER),
@@ -123,7 +121,6 @@ i2d_TS_REQ_bio(BIO *bp, TS_REQ *a)
 }
 #endif
 
-#ifndef OPENSSL_NO_FP_API
 TS_REQ *
 d2i_TS_REQ_fp(FILE *fp, TS_REQ **a)
 {
@@ -135,7 +132,6 @@ i2d_TS_REQ_fp(FILE *fp, TS_REQ *a)
 {
         return ASN1_i2d_fp_of_const(TS_REQ, i2d_TS_REQ, fp, a);
 }
-#endif
 
 ASN1_SEQUENCE(TS_ACCURACY) = {
         ASN1_OPT(TS_ACCURACY, seconds, ASN1_INTEGER),
@@ -177,7 +173,6 @@ i2d_TS_TST_INFO_bio(BIO *bp, TS_TST_INFO *a)
 }
 #endif
 
-#ifndef OPENSSL_NO_FP_API
 TS_TST_INFO *
 d2i_TS_TST_INFO_fp(FILE *fp, TS_TST_INFO **a)
 {
@@ -190,7 +185,6 @@ i2d_TS_TST_INFO_fp(FILE *fp, TS_TST_INFO *a)
 {
         return ASN1_i2d_fp_of_const(TS_TST_INFO, i2d_TS_TST_INFO, fp, a);
 }
-#endif
 
 ASN1_SEQUENCE(TS_STATUS_INFO) = {
         ASN1_SIMPLE(TS_STATUS_INFO, status, ASN1_INTEGER),
@@ -268,7 +262,6 @@ i2d_TS_RESP_bio(BIO *bp, TS_RESP *a)
 }
 #endif
 
-#ifndef OPENSSL_NO_FP_API
 TS_RESP *
 d2i_TS_RESP_fp(FILE *fp, TS_RESP **a)
 {
@@ -280,7 +273,6 @@ i2d_TS_RESP_fp(FILE *fp, TS_RESP *a)
 {
         return ASN1_i2d_fp_of_const(TS_RESP, i2d_TS_RESP, fp, a);
 }
-#endif
 
 ASN1_SEQUENCE(ESS_ISSUER_SERIAL) = {
         ASN1_SEQUENCE_OF(ESS_ISSUER_SERIAL, issuer, GENERAL_NAME),
diff --git a/src/lib/libssl/src/crypto/x509/x509.h b/src/lib/libssl/src/crypto/x509/x509.h
index 6a29e4bd71..9ac1eddb2a 100644
--- a/src/lib/libssl/src/crypto/x509/x509.h
+++ b/src/lib/libssl/src/crypto/x509/x509.h
@@ -673,7 +673,6 @@ int X509_NAME_digest(const X509_NAME *data,const EVP_MD *type,
                 unsigned char *md, unsigned int *len);
 #endif
 
-#ifndef OPENSSL_NO_FP_API
 X509 *d2i_X509_fp(FILE *fp, X509 **x509);
 int i2d_X509_fp(FILE *fp,X509 *x509);
 X509_CRL *d2i_X509_CRL_fp(FILE *fp,X509_CRL **crl);
@@ -709,7 +708,6 @@ int i2d_PrivateKey_fp(FILE *fp, EVP_PKEY *pkey);
 EVP_PKEY *d2i_PrivateKey_fp(FILE *fp, EVP_PKEY **a);
 int i2d_PUBKEY_fp(FILE *fp, EVP_PKEY *pkey);
 EVP_PKEY *d2i_PUBKEY_fp(FILE *fp, EVP_PKEY **a);
-#endif
 
 #ifndef OPENSSL_NO_BIO
 X509 *d2i_X509_bio(BIO *bp,X509 **x509);
@@ -965,13 +963,11 @@ unsigned long	X509_NAME_hash_old(X509_NAME *x);
 
 int             X509_CRL_cmp(const X509_CRL *a, const X509_CRL *b);
 int             X509_CRL_match(const X509_CRL *a, const X509_CRL *b);
-#ifndef OPENSSL_NO_FP_API
 int             X509_print_ex_fp(FILE *bp,X509 *x, unsigned long nmflag, unsigned long cflag);
 int             X509_print_fp(FILE *bp,X509 *x);
 int             X509_CRL_print_fp(FILE *bp,X509_CRL *x);
 int             X509_REQ_print_fp(FILE *bp,X509_REQ *req);
 int X509_NAME_print_ex_fp(FILE *fp, X509_NAME *nm, int indent, unsigned long flags);
-#endif
 
 #ifndef OPENSSL_NO_BIO
 int             X509_NAME_print(BIO *bp, X509_NAME *name, int obase);
diff --git a/src/lib/libssl/src/crypto/x509/x_all.c b/src/lib/libssl/src/crypto/x509/x_all.c
index 92f80ca433..95d0777829 100644
--- a/src/lib/libssl/src/crypto/x509/x_all.c
+++ b/src/lib/libssl/src/crypto/x509/x_all.c
@@ -146,7 +146,6 @@ NETSCAPE_SPKI_sign(NETSCAPE_SPKI *x, EVP_PKEY *pkey, const EVP_MD *md)
             x->sig_algor, NULL, x->signature, x->spkac, pkey, md));
 }
 
-#ifndef OPENSSL_NO_FP_API
 X509 *
 d2i_X509_fp(FILE *fp, X509 **x509)
 {
@@ -158,7 +157,6 @@ i2d_X509_fp(FILE *fp, X509 *x509)
 {
         return ASN1_item_i2d_fp(ASN1_ITEM_rptr(X509), fp, x509);
 }
-#endif
 
 X509 *
 d2i_X509_bio(BIO *bp, X509 **x509)
@@ -172,7 +170,6 @@ i2d_X509_bio(BIO *bp, X509 *x509)
         return ASN1_item_i2d_bio(ASN1_ITEM_rptr(X509), bp, x509);
 }
 
-#ifndef OPENSSL_NO_FP_API
 X509_CRL *
 d2i_X509_CRL_fp(FILE *fp, X509_CRL **crl)
 {
@@ -184,7 +181,6 @@ i2d_X509_CRL_fp(FILE *fp, X509_CRL *crl)
 {
         return ASN1_item_i2d_fp(ASN1_ITEM_rptr(X509_CRL), fp, crl);
 }
-#endif
 
 X509_CRL *
 d2i_X509_CRL_bio(BIO *bp, X509_CRL **crl)
@@ -198,7 +194,6 @@ i2d_X509_CRL_bio(BIO *bp, X509_CRL *crl)
         return ASN1_item_i2d_bio(ASN1_ITEM_rptr(X509_CRL), bp, crl);
 }
 
-#ifndef OPENSSL_NO_FP_API
 PKCS7 *
 d2i_PKCS7_fp(FILE *fp, PKCS7 **p7)
 {
@@ -210,7 +205,6 @@ i2d_PKCS7_fp(FILE *fp, PKCS7 *p7)
 {
         return ASN1_item_i2d_fp(ASN1_ITEM_rptr(PKCS7), fp, p7);
 }
-#endif
 
 PKCS7 *
 d2i_PKCS7_bio(BIO *bp, PKCS7 **p7)
@@ -224,7 +218,6 @@ i2d_PKCS7_bio(BIO *bp, PKCS7 *p7)
         return ASN1_item_i2d_bio(ASN1_ITEM_rptr(PKCS7), bp, p7);
 }
 
-#ifndef OPENSSL_NO_FP_API
 X509_REQ *
 d2i_X509_REQ_fp(FILE *fp, X509_REQ **req)
 {
@@ -236,7 +229,6 @@ i2d_X509_REQ_fp(FILE *fp, X509_REQ *req)
 {
         return ASN1_item_i2d_fp(ASN1_ITEM_rptr(X509_REQ), fp, req);
 }
-#endif
 
 X509_REQ *
 d2i_X509_REQ_bio(BIO *bp, X509_REQ **req)
@@ -252,7 +244,6 @@ i2d_X509_REQ_bio(BIO *bp, X509_REQ *req)
 
 #ifndef OPENSSL_NO_RSA
 
-#ifndef OPENSSL_NO_FP_API
 RSA *
 d2i_RSAPrivateKey_fp(FILE *fp, RSA **rsa)
 {
@@ -290,7 +281,6 @@ i2d_RSA_PUBKEY_fp(FILE *fp, RSA *rsa)
 {
         return ASN1_i2d_fp((I2D_OF(void))i2d_RSA_PUBKEY, fp, rsa);
 }
-#endif
 
 RSA *
 d2i_RSAPrivateKey_bio(BIO *bp, RSA **rsa)
@@ -331,7 +321,6 @@ i2d_RSA_PUBKEY_bio(BIO *bp, RSA *rsa)
 #endif
 
 #ifndef OPENSSL_NO_DSA
-#ifndef OPENSSL_NO_FP_API
 DSA *
 d2i_DSAPrivateKey_fp(FILE *fp, DSA **dsa)
 {
@@ -355,7 +344,6 @@ i2d_DSA_PUBKEY_fp(FILE *fp, DSA *dsa)
 {
         return ASN1_i2d_fp_of(DSA, i2d_DSA_PUBKEY, fp, dsa);
 }
-#endif
 
 DSA *
 d2i_DSAPrivateKey_bio(BIO *bp, DSA **dsa)
@@ -384,7 +372,6 @@ i2d_DSA_PUBKEY_bio(BIO *bp, DSA *dsa)
 #endif
 
 #ifndef OPENSSL_NO_EC
-#ifndef OPENSSL_NO_FP_API
 EC_KEY *
 d2i_EC_PUBKEY_fp(FILE *fp, EC_KEY **eckey)
 {
@@ -408,7 +395,6 @@ i2d_ECPrivateKey_fp(FILE *fp, EC_KEY *eckey)
 {
         return ASN1_i2d_fp_of(EC_KEY, i2d_ECPrivateKey, fp, eckey);
 }
-#endif
 EC_KEY *
 d2i_EC_PUBKEY_bio(BIO *bp, EC_KEY **eckey)
 {
@@ -487,7 +473,6 @@ PKCS7_ISSUER_AND_SERIAL_digest(PKCS7_ISSUER_AND_SERIAL *data,
 }
 
 
-#ifndef OPENSSL_NO_FP_API
 X509_SIG *
 d2i_PKCS8_fp(FILE *fp, X509_SIG **p8)
 {
@@ -499,7 +484,6 @@ i2d_PKCS8_fp(FILE *fp, X509_SIG *p8)
 {
         return ASN1_i2d_fp_of(X509_SIG, i2d_X509_SIG, fp, p8);
 }
-#endif
 
 X509_SIG *
 d2i_PKCS8_bio(BIO *bp, X509_SIG **p8)
@@ -513,7 +497,6 @@ i2d_PKCS8_bio(BIO *bp, X509_SIG *p8)
         return ASN1_i2d_bio_of(X509_SIG, i2d_X509_SIG, bp, p8);
 }
 
-#ifndef OPENSSL_NO_FP_API
 PKCS8_PRIV_KEY_INFO *
 d2i_PKCS8_PRIV_KEY_INFO_fp(FILE *fp, PKCS8_PRIV_KEY_INFO **p8inf)
 {
@@ -566,7 +549,6 @@ d2i_PUBKEY_fp(FILE *fp, EVP_PKEY **a)
         return ASN1_d2i_fp_of(EVP_PKEY, EVP_PKEY_new, d2i_PUBKEY, fp, a);
 }
 
-#endif
 
 PKCS8_PRIV_KEY_INFO *
 d2i_PKCS8_PRIV_KEY_INFO_bio(BIO *bp, PKCS8_PRIV_KEY_INFO **p8inf)
diff --git a/src/lib/libssl/src/crypto/x509v3/v3_prn.c b/src/lib/libssl/src/crypto/x509v3/v3_prn.c
index 3874ded51c..ff08534f9a 100644
--- a/src/lib/libssl/src/crypto/x509v3/v3_prn.c
+++ b/src/lib/libssl/src/crypto/x509v3/v3_prn.c
@@ -212,7 +212,6 @@ unknown_ext_print(BIO *out, X509_EXTENSION *ext, unsigned long flag,
 }
 
 
-#ifndef OPENSSL_NO_FP_API
 int
 X509V3_EXT_print_fp(FILE *fp, X509_EXTENSION *ext, int flag, int indent)
 {
@@ -225,4 +224,3 @@ X509V3_EXT_print_fp(FILE *fp, X509_EXTENSION *ext, int flag, int indent)
         BIO_free(bio_tmp);
         return ret;
 }
-#endif
diff --git a/src/lib/libssl/src/ssl/ssl.h b/src/lib/libssl/src/ssl/ssl.h
index 49b85ea042..ac2030a0a5 100644
--- a/src/lib/libssl/src/ssl/ssl.h
+++ b/src/lib/libssl/src/ssl/ssl.h
@@ -1651,9 +1651,7 @@ SSL_SESSION *SSL_SESSION_new(void);
 const unsigned char *SSL_SESSION_get_id(const SSL_SESSION *s,
             unsigned int *len);
 unsigned int SSL_SESSION_get_compress_id(const SSL_SESSION *s);
-#ifndef OPENSSL_NO_FP_API
 int     SSL_SESSION_print_fp(FILE *fp, const SSL_SESSION *ses);
-#endif
 #ifndef OPENSSL_NO_BIO
 int     SSL_SESSION_print(BIO *fp, const SSL_SESSION *ses);
 #endif
diff --git a/src/lib/libssl/src/ssl/ssl_txt.c b/src/lib/libssl/src/ssl/ssl_txt.c
index 734e0c0755..43696db847 100644
--- a/src/lib/libssl/src/ssl/ssl_txt.c
+++ b/src/lib/libssl/src/ssl/ssl_txt.c
@@ -86,7 +86,6 @@
 #include <openssl/buffer.h>
 #include "ssl_locl.h"
 
-#ifndef OPENSSL_NO_FP_API
 int
 SSL_SESSION_print_fp(FILE *fp, const SSL_SESSION *x)
 {
@@ -102,7 +101,6 @@ SSL_SESSION_print_fp(FILE *fp, const SSL_SESSION *x)
         BIO_free(b);
         return (ret);
 }
-#endif
 
 int
 SSL_SESSION_print(BIO *bp, const SSL_SESSION *x)
diff --git a/src/lib/libssl/ssl.h b/src/lib/libssl/ssl.h
index 49b85ea042..ac2030a0a5 100644
--- a/src/lib/libssl/ssl.h
+++ b/src/lib/libssl/ssl.h
@@ -1651,9 +1651,7 @@ SSL_SESSION *SSL_SESSION_new(void);
 const unsigned char *SSL_SESSION_get_id(const SSL_SESSION *s,
             unsigned int *len);
 unsigned int SSL_SESSION_get_compress_id(const SSL_SESSION *s);
-#ifndef OPENSSL_NO_FP_API
 int     SSL_SESSION_print_fp(FILE *fp, const SSL_SESSION *ses);
-#endif
 #ifndef OPENSSL_NO_BIO
 int     SSL_SESSION_print(BIO *fp, const SSL_SESSION *ses);
 #endif
diff --git a/src/lib/libssl/ssl_txt.c b/src/lib/libssl/ssl_txt.c
index 734e0c0755..43696db847 100644
--- a/src/lib/libssl/ssl_txt.c
+++ b/src/lib/libssl/ssl_txt.c
@@ -86,7 +86,6 @@
 #include <openssl/buffer.h>
 #include "ssl_locl.h"
 
-#ifndef OPENSSL_NO_FP_API
 int
 SSL_SESSION_print_fp(FILE *fp, const SSL_SESSION *x)
 {
@@ -102,7 +101,6 @@ SSL_SESSION_print_fp(FILE *fp, const SSL_SESSION *x)
         BIO_free(b);
         return (ret);
 }
-#endif
 
 int
 SSL_SESSION_print(BIO *bp, const SSL_SESSION *x)