commit b6c6898234a12b9c6cdaa8f16fb9156097649ad7
author Dr. Stephen Henson <steve@openssl.org> Thu Nov 17 13:17:28 2016 +0000
committer Dr. Stephen Henson <steve@openssl.org> Thu Nov 17 18:45:42 2016 +0000
tree d89db544e30df9ece1e2df78da72ef1727b6417d
parent 32bbb62ea634239e7cb91d6450ba23517082bab6

Support MSBLOB format if RC4 is disabled

Reviewed-by: Matt Caswell <matt@openssl.org>

apps/dsa.c

diff --git a/apps/dsa.c b/apps/dsa.c
index d88116f..dddc5b8 100644
--- a/apps/dsa.c
+++ b/apps/dsa.c
@@ -213,7 +213,7 @@
             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 @@
                 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);