From: Pauli Date: Tue, 6 May 2025 03:18:34 +0000 (+1000) Subject: dh: add security category support X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=4577a4a59f5ec368f3bb062ed34abdf08dbbbd27;p=thirdparty%2Fopenssl.git dh: add security category support Reviewed-by: Shane Lontis Reviewed-by: Dmitry Belyavskiy (Merged from https://github.com/openssl/openssl/pull/27571) --- diff --git a/providers/implementations/keymgmt/dh_kmgmt.c b/providers/implementations/keymgmt/dh_kmgmt.c index c2ee8593557..b2823cbab08 100644 --- a/providers/implementations/keymgmt/dh_kmgmt.c +++ b/providers/implementations/keymgmt/dh_kmgmt.c @@ -334,6 +334,9 @@ static ossl_inline int dh_get_params(void *key, OSSL_PARAM params[]) if (p->return_size == 0) return 0; } + if ((p = OSSL_PARAM_locate(params, OSSL_PKEY_PARAM_SECURITY_CATEGORY)) != NULL) + if (!OSSL_PARAM_set_int(p, 0)) + return 0; return ossl_dh_params_todata(dh, NULL, params) && ossl_dh_key_todata(dh, NULL, params, 1); @@ -343,6 +346,7 @@ static const OSSL_PARAM dh_params[] = { OSSL_PARAM_int(OSSL_PKEY_PARAM_BITS, NULL), OSSL_PARAM_int(OSSL_PKEY_PARAM_SECURITY_BITS, NULL), OSSL_PARAM_int(OSSL_PKEY_PARAM_MAX_SIZE, NULL), + OSSL_PARAM_int(OSSL_PKEY_PARAM_SECURITY_CATEGORY, NULL), OSSL_PARAM_octet_string(OSSL_PKEY_PARAM_ENCODED_PUBLIC_KEY, NULL, 0), DH_IMEXPORTABLE_PARAMETERS, DH_IMEXPORTABLE_PUBLIC_KEY,