Commit b6c68982 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Support MSBLOB format if RC4 is disabled 



Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
parent 32bbb62e

apps/dsa.c

+7 −1
Original line number Diff line number Diff line
@@ -213,7 +213,7 @@ int dsa_main(int argc, char **argv) 
            i = PEM_write_bio_DSAPrivateKey(out, dsa, enc,

                                            NULL, 0, NULL, passout);

        }

# if !defined(OPENSSL_NO_RSA) && !defined(OPENSSL_NO_RC4)

# ifndef OPENSSL_NO_RSA

    } else if (outformat == FORMAT_MSBLOB || outformat == FORMAT_PVK) {

        EVP_PKEY *pk;

        pk = EVP_PKEY_new();
@@ -225,7 +225,13 @@ int dsa_main(int argc, char **argv) 
                goto end;

            }

            assert(private);

#  ifdef OPENSSL_NO_RC4

            BIO_printf(bio_err, "PVK format not supported\n");

            EVP_PKEY_free(pk);

            goto end;

#  else

            i = i2b_PVK_bio(out, pk, pvk_encr, 0, passout);

#  endif

        }

        else if (pubin || pubout)

            i = i2b_PublicKey_bio(out, pk);

apps/rsa.c

+7 −1
Original line number Diff line number Diff line
@@ -263,7 +263,7 @@ int rsa_main(int argc, char **argv) 
            i = PEM_write_bio_RSAPrivateKey(out, rsa,

                                            enc, NULL, 0, NULL, passout);

        }

# if !defined(OPENSSL_NO_DSA) && !defined(OPENSSL_NO_RC4)

# ifndef OPENSSL_NO_DSA

    } else if (outformat == FORMAT_MSBLOB || outformat == FORMAT_PVK) {

        EVP_PKEY *pk;

        pk = EVP_PKEY_new();
@@ -275,7 +275,13 @@ int rsa_main(int argc, char **argv) 
                goto end;

            }

            assert(private);

#  ifdef OPENSSL_NO_RC4

            BIO_printf(bio_err, "PVK format not supported\n");

            EVP_PKEY_free(pk);

            goto end;

#  else

            i = i2b_PVK_bio(out, pk, pvk_encr, 0, passout);

#  endif

        } else if (pubin || pubout) {

            i = i2b_PublicKey_bio(out, pk);

        } else {