Support loading private keys from engine instead of file

This commit is contained in:
Zhi Guan
2018-01-20 10:05:05 +08:00
parent 755814db52
commit 4ae40d435b

View File

@@ -704,7 +704,7 @@ OPTIONS s_server_options[] = {
"PEM serverinfo file for certificate"}, "PEM serverinfo file for certificate"},
{"certform", OPT_CERTFORM, 'F', {"certform", OPT_CERTFORM, 'F',
"Certificate format (PEM or DER) PEM default"}, "Certificate format (PEM or DER) PEM default"},
{"key", OPT_KEY, '<', {"key", OPT_KEY, 's',
"Private Key if not in -cert; default is " TEST_CERT}, "Private Key if not in -cert; default is " TEST_CERT},
{"keyform", OPT_KEYFORM, 'f', {"keyform", OPT_KEYFORM, 'f',
"Key format (PEM, DER or ENGINE) PEM default"}, "Key format (PEM, DER or ENGINE) PEM default"},
@@ -713,7 +713,7 @@ OPTIONS s_server_options[] = {
"Second certificate file to use (usually for DSA)"}, "Second certificate file to use (usually for DSA)"},
{"dcertform", OPT_DCERTFORM, 'F', {"dcertform", OPT_DCERTFORM, 'F',
"Second certificate format (PEM or DER) PEM default"}, "Second certificate format (PEM or DER) PEM default"},
{"dkey", OPT_DKEY, '<', {"dkey", OPT_DKEY, 's',
"Second private key file to use (usually for DSA)"}, "Second private key file to use (usually for DSA)"},
{"dkeyform", OPT_DKEYFORM, 'F', {"dkeyform", OPT_DKEYFORM, 'F',
"Second key format (PEM, DER or ENGINE) PEM default"}, "Second key format (PEM, DER or ENGINE) PEM default"},
@@ -743,7 +743,7 @@ OPTIONS s_server_options[] = {
"mismatch send fatal alert (default warning alert)"}, "mismatch send fatal alert (default warning alert)"},
{"cert2", OPT_CERT2, '<', {"cert2", OPT_CERT2, '<',
"Certificate file to use for servername; default is" TEST_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"}, "-Private Key file to use for servername if not in -cert2"},
{"tlsextdebug", OPT_TLSEXTDEBUG, '-', {"tlsextdebug", OPT_TLSEXTDEBUG, '-',
"Hex dump of all TLS extensions received"}, "Hex dump of all TLS extensions received"},