X-Git-Url: https://git.openssl.org/gitweb/?a=blobdiff_plain;f=apps%2Fpkey.c;h=40db6f57f97f6a48964bbe5418a116df0db67e44;hb=2bec39eb86986349d2538fffc821f2e1106cee14;hp=9ef228f3a0934def409426a094aa3f2e664fcc9c;hpb=d303b9d85e1888494785f87ebd9bd233e63564a9;p=openssl.git diff --git a/apps/pkey.c b/apps/pkey.c index 9ef228f3a0..40db6f57f9 100644 --- a/apps/pkey.c +++ b/apps/pkey.c @@ -169,10 +169,7 @@ int pkey_main(int argc, char **argv) goto end; } - if (!app_load_modules(NULL)) - goto end; - - out = bio_open_owner(outfile, WB(outformat), private); + out = bio_open_owner(outfile, outformat, private); if (out == NULL) goto end; @@ -185,18 +182,20 @@ int pkey_main(int argc, char **argv) if (!noout) { if (outformat == FORMAT_PEM) { - assert(private); if (pubout) PEM_write_bio_PUBKEY(out, pkey); - else + else { + assert(private); PEM_write_bio_PrivateKey(out, pkey, cipher, NULL, 0, NULL, passout); + } } else if (outformat == FORMAT_ASN1) { - assert(private); if (pubout) i2d_PUBKEY_bio(out, pkey); - else + else { + assert(private); i2d_PrivateKey_bio(out, pkey); + } } else { BIO_printf(bio_err, "Bad format specified for key\n"); goto end;