diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2016-09-28 13:07:52 +0100 |
|---|---|---|
| committer | Richard Levitte <richard@levitte.org> | 2016-09-29 12:52:15 +0200 |
| commit | 9cb0c3a3cae638143af8bc66dd2b19f7593e3978 (patch) | |
| tree | bed4cc2e90c83bac8d53d7cb124ac9d8f025f539 /apps | |
| parent | 61b1eb2c67542c85311843300f49d019f80afc6c (diff) | |
Restore '-keyform engine' support for s_client
This used to work in 1.0.2 but disappeared when the argument parsing was
revamped.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1639)
(cherry picked from commit a6972f346248fbc37e42056bb943fae0896a2967)
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/s_client.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/s_client.c b/apps/s_client.c index 41f6d48d3d..10ea1f1167 100644 --- a/apps/s_client.c +++ b/apps/s_client.c @@ -577,8 +577,8 @@ OPTIONS s_client_options[] = { {"cert", OPT_CERT, '<', "Certificate file to use, PEM format assumed"}, {"certform", OPT_CERTFORM, 'F', "Certificate format (PEM or DER) PEM default"}, - {"key", OPT_KEY, '<', "Private key file to use, if not in -cert file"}, - {"keyform", OPT_KEYFORM, 'F', "Key format (PEM or DER) PEM default"}, + {"key", OPT_KEY, 's', "Private key file to use, if not in -cert file"}, + {"keyform", OPT_KEYFORM, 'E', "Key format (PEM, DER or engine) PEM default"}, {"pass", OPT_PASS, 's', "Private key file pass phrase source"}, {"CApath", OPT_CAPATH, '/', "PEM format directory of CA's"}, {"CAfile", OPT_CAFILE, '<', "PEM format file of CA's"}, @@ -1202,7 +1202,7 @@ int s_client_main(int argc, char **argv) fallback_scsv = 1; break; case OPT_KEYFORM: - if (!opt_format(opt_arg(), OPT_FMT_PEMDER, &key_format)) + if (!opt_format(opt_arg(), OPT_FMT_PDE, &key_format)) goto opthelp; break; case OPT_PASS: |