1 files changed, 0 insertions, 157 deletions

diff --git a/src/lib/libcrypto/pem/pem_all.c b/src/lib/libcrypto/pem/pem_all.c
index eac0460e3e..6ff6be7fbe 100644
--- a/src/lib/libcrypto/pem/pem_all.c
+++ b/src/lib/libcrypto/pem/pem_all.c
@@ -193,61 +193,8 @@ RSA *PEM_read_RSAPrivateKey(FILE *fp, RSA **rsa, pem_password_cb *cb,
 
 #endif
 
-#ifdef OPENSSL_FIPS
-
-int PEM_write_bio_RSAPrivateKey(BIO *bp, RSA *x, const EVP_CIPHER *enc,
-                                               unsigned char *kstr, int klen,
-                                               pem_password_cb *cb, void *u)
-{
-        if (FIPS_mode())
-                {
-                EVP_PKEY *k;
-                int ret;
-                k = EVP_PKEY_new();
-                if (!k)
-                        return 0;
-                EVP_PKEY_set1_RSA(k, x);
-
-                ret = PEM_write_bio_PrivateKey(bp, k, enc, kstr, klen, cb, u);
-                EVP_PKEY_free(k);
-                return ret;
-                }
-        else
-                return PEM_ASN1_write_bio((i2d_of_void *)i2d_RSAPrivateKey,
-                                        PEM_STRING_RSA,bp,x,enc,kstr,klen,cb,u);
-}
-
-#ifndef OPENSSL_NO_FP_API
-int PEM_write_RSAPrivateKey(FILE *fp, RSA *x, const EVP_CIPHER *enc,
-                                               unsigned char *kstr, int klen,
-                                               pem_password_cb *cb, void *u)
-{
-        if (FIPS_mode())
-                {
-                EVP_PKEY *k;
-                int ret;
-                k = EVP_PKEY_new();
-                if (!k)
-                        return 0;
-
-                EVP_PKEY_set1_RSA(k, x);
-
-                ret = PEM_write_PrivateKey(fp, k, enc, kstr, klen, cb, u);
-                EVP_PKEY_free(k);
-                return ret;
-                }
-        else
-                return PEM_ASN1_write((i2d_of_void *)i2d_RSAPrivateKey,
-                                        PEM_STRING_RSA,fp,x,enc,kstr,klen,cb,u);
-}
-#endif
-
-#else
-
 IMPLEMENT_PEM_write_cb_const(RSAPrivateKey, RSA, PEM_STRING_RSA, RSAPrivateKey)
 
-#endif
-
 IMPLEMENT_PEM_rw_const(RSAPublicKey, RSA, PEM_STRING_RSA_PUBLIC, RSAPublicKey)
 IMPLEMENT_PEM_rw(RSA_PUBKEY, RSA, PEM_STRING_PUBLIC, RSA_PUBKEY)
 
@@ -277,59 +224,8 @@ DSA *PEM_read_bio_DSAPrivateKey(BIO *bp, DSA **dsa, pem_password_cb *cb,
         return pkey_get_dsa(pktmp, dsa);        /* will free pktmp */
 }
 
-#ifdef OPENSSL_FIPS
-
-int PEM_write_bio_DSAPrivateKey(BIO *bp, DSA *x, const EVP_CIPHER *enc,
-                                               unsigned char *kstr, int klen,
-                                               pem_password_cb *cb, void *u)
-{
-        if (FIPS_mode())
-                {
-                EVP_PKEY *k;
-                int ret;
-                k = EVP_PKEY_new();
-                if (!k)
-                        return 0;
-                EVP_PKEY_set1_DSA(k, x);
-
-                ret = PEM_write_bio_PrivateKey(bp, k, enc, kstr, klen, cb, u);
-                EVP_PKEY_free(k);
-                return ret;
-                }
-        else
-                return PEM_ASN1_write_bio((i2d_of_void *)i2d_DSAPrivateKey,
-                                        PEM_STRING_DSA,bp,x,enc,kstr,klen,cb,u);
-}
-
-#ifndef OPENSSL_NO_FP_API
-int PEM_write_DSAPrivateKey(FILE *fp, DSA *x, const EVP_CIPHER *enc,
-                                               unsigned char *kstr, int klen,
-                                               pem_password_cb *cb, void *u)
-{
-        if (FIPS_mode())
-                {
-                EVP_PKEY *k;
-                int ret;
-                k = EVP_PKEY_new();
-                if (!k)
-                        return 0;
-                EVP_PKEY_set1_DSA(k, x);
-                ret = PEM_write_PrivateKey(fp, k, enc, kstr, klen, cb, u);
-                EVP_PKEY_free(k);
-                return ret;
-                }
-        else
-                return PEM_ASN1_write((i2d_of_void *)i2d_DSAPrivateKey,
-                                        PEM_STRING_DSA,fp,x,enc,kstr,klen,cb,u);
-}
-#endif
-
-#else
-
 IMPLEMENT_PEM_write_cb_const(DSAPrivateKey, DSA, PEM_STRING_DSA, DSAPrivateKey)
 
-#endif
-
 IMPLEMENT_PEM_rw(DSA_PUBKEY, DSA, PEM_STRING_PUBLIC, DSA_PUBKEY)
 
 #ifndef OPENSSL_NO_FP_API
@@ -377,61 +273,8 @@ IMPLEMENT_PEM_rw_const(ECPKParameters, EC_GROUP, PEM_STRING_ECPARAMETERS, ECPKPa
 
 
 
-#ifdef OPENSSL_FIPS
-
-int PEM_write_bio_ECPrivateKey(BIO *bp, EC_KEY *x, const EVP_CIPHER *enc,
-                                               unsigned char *kstr, int klen,
-                                               pem_password_cb *cb, void *u)
-{
-        if (FIPS_mode())
-                {
-                EVP_PKEY *k;
-                int ret;
-                k = EVP_PKEY_new();
-                if (!k)
-                        return 0;
-                EVP_PKEY_set1_EC_KEY(k, x);
-
-                ret = PEM_write_bio_PrivateKey(bp, k, enc, kstr, klen, cb, u);
-                EVP_PKEY_free(k);
-                return ret;
-                }
-        else
-                return PEM_ASN1_write_bio((i2d_of_void *)i2d_ECPrivateKey,
-                                                PEM_STRING_ECPRIVATEKEY,
-                                                bp,x,enc,kstr,klen,cb,u);
-}
-
-#ifndef OPENSSL_NO_FP_API
-int PEM_write_ECPrivateKey(FILE *fp, EC_KEY *x, const EVP_CIPHER *enc,
-                                               unsigned char *kstr, int klen,
-                                               pem_password_cb *cb, void *u)
-{
-        if (FIPS_mode())
-                {
-                EVP_PKEY *k;
-                int ret;
-                k = EVP_PKEY_new();
-                if (!k)
-                        return 0;
-                EVP_PKEY_set1_EC_KEY(k, x);
-                ret = PEM_write_PrivateKey(fp, k, enc, kstr, klen, cb, u);
-                EVP_PKEY_free(k);
-                return ret;
-                }
-        else
-                return PEM_ASN1_write((i2d_of_void *)i2d_ECPrivateKey,
-                                                PEM_STRING_ECPRIVATEKEY,
-                                                fp,x,enc,kstr,klen,cb,u);
-}
-#endif
-
-#else
-
 IMPLEMENT_PEM_write_cb(ECPrivateKey, EC_KEY, PEM_STRING_ECPRIVATEKEY, ECPrivateKey)
 
-#endif
-
 IMPLEMENT_PEM_rw(EC_PUBKEY, EC_KEY, PEM_STRING_PUBLIC, EC_PUBKEY)
 
 #ifndef OPENSSL_NO_FP_API