From: wangcheng Date: Wed, 6 Sep 2023 13:29:38 +0000 (+0800) Subject: Modify the dkeyform type to support engine X-Git-Tag: openssl-3.1.3~32 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9bb1307dce332c3cfa0a9750bbb59195a01693f3;p=thirdparty%2Fopenssl.git Modify the dkeyform type to support engine The valtype value of dkeyform defined in the s_server_options structure is F, which leads to the judgment that the engine is not supported when processing parameters in the opt_next function. This the valtype value of dkeyform should be changed to "f". CLA: trivial Reviewed-by: Tomas Mraz Reviewed-by: Paul Dale (Merged from https://github.com/openssl/openssl/pull/21982) (cherry picked from commit b9a189ce87fde1de4bf691031624538262f005c5) --- diff --git a/apps/s_server.c b/apps/s_server.c index 47608933555..8daa58f9f63 100644 --- a/apps/s_server.c +++ b/apps/s_server.c @@ -788,7 +788,7 @@ const OPTIONS s_server_options[] = { "second server certificate chain file in PEM format"}, {"dkey", OPT_DKEY, '<', "Second private key file to use (usually for DSA)"}, - {"dkeyform", OPT_DKEYFORM, 'F', + {"dkeyform", OPT_DKEYFORM, 'f', "Second key file format (ENGINE, other values ignored)"}, {"dpass", OPT_DPASS, 's', "Second private key and cert file pass phrase source"},