[openssl-commits] [openssl] master update

[Dr. Stephen Henson]

The branch master has been updated
       via  75c445e49bb3d22afe72b28ae67945a9f67091f6 (commit)
      from  9e84a42db497e06a38f804b5acd09b6aa4f87db3 (commit)


- Log -----------------------------------------------------------------
commit 75c445e49bb3d22afe72b28ae67945a9f67091f6
Author: Pichulin Dmitrii <deem at deem.ru>
Date:   Fri Sep 22 11:41:04 2017 +0300

    Fix 'key' option in s_server can be in ENGINE keyform
    
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    Reviewed-by: Stephen Henson <steve at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/4405)

-----------------------------------------------------------------------

Summary of changes:
 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 d54909a..bc3922b 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"},