[openssl-commits] [openssl] OpenSSL_1_1_0-stable update

[Dr. Stephen Henson]

The branch OpenSSL_1_1_0-stable has been updated
       via  4c9a6a390326038dfe4a3bd3453cb1aa23d33747 (commit)
      from  32ef82a29dc54b54ff0758514396847575c3c499 (commit)


- Log -----------------------------------------------------------------
commit 4c9a6a390326038dfe4a3bd3453cb1aa23d33747
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)
    
    (cherry picked from commit 75c445e49bb3d22afe72b28ae67945a9f67091f6)

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

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 a445ad2..f6418af 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"},