diff options
author | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2020-12-15 14:30:38 +0100 |
---|---|---|
committer | Dr. David von Oheimb <dev@ddvo.net> | 2021-01-11 19:35:34 +0100 |
commit | 475d10028e57ae0987911af580f0de8d701325ec (patch) | |
tree | 1c967a094f28429d411ede54a4668a9f4fc68000 /apps | |
parent | 400e2acfe0bae9aec1f9df50fa51f6b7cf8ad779 (diff) |
apps/pkey.c: Make clear that -passout is not supported for DER output
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/13712)
Diffstat (limited to 'apps')
-rw-r--r-- | apps/pkey.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/apps/pkey.c b/apps/pkey.c index 67dc8c012c..c6308e2f0a 100644 --- a/apps/pkey.c +++ b/apps/pkey.c @@ -66,7 +66,7 @@ const OPTIONS pkey_options[] = { OPT_SECTION("Output"), {"outform", OPT_OUTFORM, 'F', "Output format (DER or PEM)"}, - {"passout", OPT_PASSOUT, 's', "Output file pass phrase source"}, + {"passout", OPT_PASSOUT, 's', "Output PEM file pass phrase source"}, {"out", OPT_OUT, '>', "Output file"}, {"pubout", OPT_PUBOUT, '-', "Output public key, not private"}, {"text_pub", OPT_TEXT_PUB, '-', "Only output public key components"}, @@ -196,6 +196,11 @@ int pkey_main(int argc, char **argv) if (text && !pubtext) private = 1; + if (outformat == FORMAT_ASN1 && passoutarg != NULL) { + BIO_printf(bio_err, "The -passout option is not supported for DER output\n"); + goto end; + } + if (!app_passwd(passinarg, passoutarg, &passin, &passout)) { BIO_printf(bio_err, "Error getting passwords\n"); goto end; |