]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
Fix DH gettable OSSL_PKEY_PARAM_DH_PRIV_LEN so that it has the correct
authorShane Lontis <shane.lontis@oracle.com>
Mon, 22 Mar 2021 02:04:34 +0000 (12:04 +1000)
committerShane Lontis <shane.lontis@oracle.com>
Mon, 29 Mar 2021 23:45:07 +0000 (09:45 +1000)
type.

Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14564)

providers/implementations/keymgmt/dh_kmgmt.c

index abaf6c9ce89b33f7142588ef70cf4617e7da2d4e..3a78d4863a17b3a0e580aac2627b7d2bce944533 100644 (file)
@@ -228,9 +228,9 @@ err:
     OSSL_PARAM_int(OSSL_PKEY_PARAM_FFC_GINDEX, NULL),                          \
     OSSL_PARAM_int(OSSL_PKEY_PARAM_FFC_PCOUNTER, NULL),                        \
     OSSL_PARAM_int(OSSL_PKEY_PARAM_FFC_H, NULL),                               \
+    OSSL_PARAM_int(OSSL_PKEY_PARAM_DH_PRIV_LEN, NULL),                         \
     OSSL_PARAM_octet_string(OSSL_PKEY_PARAM_FFC_SEED, NULL, 0),                \
-    OSSL_PARAM_utf8_string(OSSL_PKEY_PARAM_GROUP_NAME, NULL, 0),               \
-    OSSL_PARAM_utf8_string(OSSL_PKEY_PARAM_DH_PRIV_LEN, NULL, 0)
+    OSSL_PARAM_utf8_string(OSSL_PKEY_PARAM_GROUP_NAME, NULL, 0)
 # define DH_IMEXPORTABLE_PUBLIC_KEY                                            \
     OSSL_PARAM_BN(OSSL_PKEY_PARAM_PUB_KEY, NULL, 0)
 # define DH_IMEXPORTABLE_PRIVATE_KEY                                           \