diff options
| author | Rich Salz <rsalz@openssl.org> | 2017-05-20 21:44:31 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2017-05-21 17:20:31 -0400 |
| commit | 48b5352212d8c68f7fd071ca9f38822b7e954c5a (patch) | |
| tree | 0d85f3a02545caa8ddd9b4ef4268942ce36775f5 /apps | |
| parent | c80bbcbf99fa3bf7954b2ff7aa2168c3f51f3ade (diff) | |
-inkey can be an identifier, not just a file
update pkcs12, smime, ts apps.
Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3507)
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/pkcs12.c | 2 | ||||
| -rw-r--r-- | apps/smime.c | 2 | ||||
| -rw-r--r-- | apps/ts.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/apps/pkcs12.c b/apps/pkcs12.c index d8e56fbf90..8280676cb3 100644 --- a/apps/pkcs12.c +++ b/apps/pkcs12.c @@ -91,7 +91,7 @@ const OPTIONS pkcs12_options[] = { {"keypbe", OPT_KEYPBE, 's', "Private key PBE algorithm (default 3DES)"}, {"rand", OPT_RAND, 's', "Load the file(s) into the random number generator"}, - {"inkey", OPT_INKEY, '<', "Private key if not infile"}, + {"inkey", OPT_INKEY, 's', "Private key if not infile"}, {"certfile", OPT_CERTFILE, '<', "Load certs from file"}, {"name", OPT_NAME, 's', "Use name as friendly name"}, {"CSP", OPT_CSP, 's', "Microsoft CSP name"}, diff --git a/apps/smime.c b/apps/smime.c index dbafd0f62d..abc139e807 100644 --- a/apps/smime.c +++ b/apps/smime.c @@ -70,7 +70,7 @@ const OPTIONS smime_options[] = { {"recip", OPT_RECIP, '<', "Recipient certificate file for decryption"}, {"in", OPT_IN, '<', "Input file"}, {"inform", OPT_INFORM, 'c', "Input format SMIME (default), PEM or DER"}, - {"inkey", OPT_INKEY, '<', + {"inkey", OPT_INKEY, 's', "Input private key (if not signer or recipient)"}, {"keyform", OPT_KEYFORM, 'f', "Input private key format (PEM or ENGINE)"}, {"out", OPT_OUT, '>', "Output file"}, @@ -106,7 +106,7 @@ const OPTIONS ts_options[] = { {"reply", OPT_REPLY, '-', "Generate a TS reply"}, {"queryfile", OPT_QUERYFILE, '<', "File containing a TS query"}, {"passin", OPT_PASSIN, 's', "Input file pass phrase source"}, - {"inkey", OPT_INKEY, '<', "File with private key for reply"}, + {"inkey", OPT_INKEY, 's', "File with private key for reply"}, {"signer", OPT_SIGNER, 's', "Signer certificate file"}, {"chain", OPT_CHAIN, '<', "File with signer CA chain"}, {"verify", OPT_VERIFY, '-', "Verify a TS response"}, |