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)

diff --git a/apps/s_server.c b/apps/s_server.c
index d54909ac4976bfd002af5accca7f7af078dc2538..bc3922b03057e1a9a17c1dffbbf3e6f29272f566 100644 (file)
--- 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"},