From 4ae40d435b277cce42a7f99564fbabd3acc80407 Mon Sep 17 00:00:00 2001
From: Zhi Guan <guan@pku.edu.cn>
Date: Sat, 20 Jan 2018 10:05:05 +0800
Subject: [PATCH] Support loading private keys from engine instead of file

---
 apps/s_server.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/s_server.c b/apps/s_server.c
index df781c64..404260b1 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"},
@@ -713,7 +713,7 @@ OPTIONS s_server_options[] = {
      "Second certificate file to use (usually for DSA)"},
     {"dcertform", OPT_DCERTFORM, 'F',
      "Second certificate format (PEM or DER) PEM default"},
-    {"dkey", OPT_DKEY, '<',
+    {"dkey", OPT_DKEY, 's',
      "Second private key file to use (usually for DSA)"},
     {"dkeyform", OPT_DKEYFORM, 'F',
      "Second key format (PEM, DER or ENGINE) PEM default"},
@@ -743,7 +743,7 @@ OPTIONS s_server_options[] = {
      "mismatch send fatal alert (default warning alert)"},
     {"cert2", OPT_CERT2, '<',
      "Certificate file to use for servername; default is" TEST_CERT2},
-    {"key2", OPT_KEY2, '<',
+    {"key2", OPT_KEY2, 's',
      "-Private Key file to use for servername if not in -cert2"},
     {"tlsextdebug", OPT_TLSEXTDEBUG, '-',
      "Hex dump of all TLS extensions received"},