diff options
| author | Pichulin Dmitrii <deem@deem.ru> | 2017-09-22 11:41:04 +0300 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2017-09-23 12:59:46 +0100 |
| commit | 75c445e49bb3d22afe72b28ae67945a9f67091f6 (patch) | |
| tree | 76a1ed4e96cf2f2cfb6f2a58411d69c8a4952d49 /apps/s_server.c | |
| parent | 9e84a42db497e06a38f804b5acd09b6aa4f87db3 (diff) | |
Fix 'key' option in s_server can be in ENGINE keyform
Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Stephen Henson <steve@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4405)
Diffstat (limited to 'apps/s_server.c')
| -rw-r--r-- | apps/s_server.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/s_server.c b/apps/s_server.c index d54909ac49..bc3922b030 100644 --- a/apps/s_server.c +++ b/apps/s_server.c @@ -788,7 +788,7 @@ const OPTIONS s_server_options[] = { "PEM serverinfo file for certificate"}, {"certform", OPT_CERTFORM, 'F', "Certificate format (PEM or DER) PEM default"}, - {"key", OPT_KEY, '<', + {"key", OPT_KEY, 's', "Private Key if not in -cert; default is " TEST_CERT}, {"keyform", OPT_KEYFORM, 'f', "Key format (PEM, DER or ENGINE) PEM default"}, |