]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
Modify the dkeyform type to support engine
authorwangcheng <bangwangnj@163.com>
Wed, 6 Sep 2023 13:29:38 +0000 (21:29 +0800)
committerPauli <pauli@openssl.org>
Fri, 8 Sep 2023 06:16:31 +0000 (16:16 +1000)
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 <tomas@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/21982)

apps/s_server.c

index 7f5ab35b766adb77eadaeab0a82d98ffd6438af8..1dc04d0060d4b5b9ee9f591072f15395c9156f4c 100644 (file)
@@ -799,7 +799,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"},