From 4c9a6a390326038dfe4a3bd3453cb1aa23d33747 Mon Sep 17 00:00:00 2001 From: Pichulin Dmitrii Date: Fri, 22 Sep 2017 11:41:04 +0300 Subject: [PATCH] Fix 'key' option in s_server can be in ENGINE keyform Reviewed-by: Paul Dale Reviewed-by: Stephen Henson (Merged from https://github.com/openssl/openssl/pull/4405) (cherry picked from commit 75c445e49bb3d22afe72b28ae67945a9f67091f6) --- apps/s_server.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/s_server.c b/apps/s_server.c index a445ad2cc2..f6418af46b 100644 --- a/apps/s_server.c +++ b/apps/s_server.c @@ -704,7 +704,7 @@ 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"}, -- 2.25.1