1 files changed, 0 insertions, 15 deletions

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,