OpenSSL 3.4 added the OSSL_FUNC_KEYMGMT_GEN_GET_PARAMS and OSSL_FUNC_KEYMGMT_GEN_GETTABLE_PARAMS callbacks for querying key generation context parameters. The uadk provider does not register them, so EVP_PKEY_CTX_get_params() on a generation context fails as unsupported whenever the uadk keymgmt is selected. Add gen_get_params and gen_gettable_params callbacks to the DH, EC, ECX (X25519/X448), RSA, and SM2 keymgmt implementations, delegating to the default provider on OpenSSL 3.4+. Remove redundant ossl_ecx_gen_set_params definition and delegate directly to default provider's gen_set_params, avoiding duplicate parameter processing (group name, propq, DHKEM IKM). Signed-off-by: Weili Qian <qianweili@huawei.com> --- src/uadk_prov_dh.c | 19 ++++++++ src/uadk_prov_ec_kmgmt.c | 19 ++++++++ src/uadk_prov_ecx.c | 92 +++++++++++++++++++-------------------- src/uadk_prov_pkey.h | 33 +++++++++++--- src/uadk_prov_rsa_kmgmt.c | 25 +++++++++++ src/uadk_prov_sm2_kmgmt.c | 19 ++++++++ 6 files changed, 156 insertions(+), 51 deletions(-) diff --git a/src/uadk_prov_dh.c b/src/uadk_prov_dh.c index d78cd88..bd403d7 100644 --- a/src/uadk_prov_dh.c +++ b/src/uadk_prov_dh.c @@ -367,6 +367,25 @@ static const OSSL_PARAM *uadk_keymgmt_dh_gen_settable_params(ossl_unused void *g return get_default_dh_keymgmt().gen_settable_params(genctx, provctx); } +#if OPENSSL_VERSION_NUMBER >= 0x30400000L +static int uadk_keymgmt_dh_gen_get_params(void *genctx, OSSL_PARAM params[]) +{ + if (get_default_dh_keymgmt().gen_get_params == NULL) + return UADK_P_FAIL; + + return get_default_dh_keymgmt().gen_get_params(genctx, params); +} + +static const OSSL_PARAM *uadk_keymgmt_dh_gen_gettable_params(ossl_unused void *genctx, + ossl_unused void *provctx) +{ + if (get_default_dh_keymgmt().gen_gettable_params == NULL) + return NULL; + + return get_default_dh_keymgmt().gen_gettable_params(genctx, provctx); +} +#endif + static int uadk_keymgmt_dh_gen_set_params(void *genctx, const OSSL_PARAM params[]) { diff --git a/src/uadk_prov_ec_kmgmt.c b/src/uadk_prov_ec_kmgmt.c index 9896d09..c93fd13 100644 --- a/src/uadk_prov_ec_kmgmt.c +++ b/src/uadk_prov_ec_kmgmt.c @@ -659,6 +659,25 @@ static const OSSL_PARAM *uadk_keymgmt_ec_gen_settable_params(ossl_unused void *g return settable; } +#if OPENSSL_VERSION_NUMBER >= 0x30400000L +static int uadk_keymgmt_ec_gen_get_params(void *genctx, OSSL_PARAM params[]) +{ + if (!get_default_ec_keymgmt().gen_get_params) + return UADK_P_FAIL; + + return get_default_ec_keymgmt().gen_get_params(genctx, params); +} + +static const OSSL_PARAM *uadk_keymgmt_ec_gen_gettable_params(ossl_unused void *genctx, + ossl_unused void *provctx) +{ + if (!get_default_ec_keymgmt().gen_gettable_params) + return NULL; + + return get_default_ec_keymgmt().gen_gettable_params(genctx, provctx); +} +#endif + static void *uadk_keymgmt_ec_new(void *provctx) { if (!get_default_ec_keymgmt().new_fun) diff --git a/src/uadk_prov_ecx.c b/src/uadk_prov_ecx.c index 27e9b86..e76d646 100644 --- a/src/uadk_prov_ecx.c +++ b/src/uadk_prov_ecx.c @@ -302,6 +302,25 @@ static const OSSL_PARAM *uadk_keymgmt_x448_gen_settable_params(ossl_unused void return get_default_x448_keymgmt().gen_settable_params(genctx, provctx); } +#if OPENSSL_VERSION_NUMBER >= 0x30400000L +static int uadk_keymgmt_x448_gen_get_params(void *genctx, OSSL_PARAM params[]) +{ + if (get_default_x448_keymgmt().gen_get_params == NULL) + return UADK_P_FAIL; + + return get_default_x448_keymgmt().gen_get_params(genctx, params); +} + +static const OSSL_PARAM *uadk_keymgmt_x448_gen_gettable_params(ossl_unused void *genctx, + ossl_unused void *provctx) +{ + if (get_default_x448_keymgmt().gen_gettable_params == NULL) + return NULL; + + return get_default_x448_keymgmt().gen_gettable_params(genctx, provctx); +} +#endif + static int uadk_keymgmt_x448_gen_set_template(void *genctx, void *templ) { return UADK_P_SUCCESS; @@ -378,50 +397,6 @@ static int uadk_keymgmt_x448_get_params(void *key, OSSL_PARAM params[]) X448_KEYLEN); } -static int ossl_ecx_gen_set_params(void *genctx, const OSSL_PARAM params[]) -{ - PROV_ECX_KEYMGMT_CTX *gctx = (PROV_ECX_KEYMGMT_CTX *)genctx; - const char *groupname = NULL; - const OSSL_PARAM *p; - - p = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_GROUP_NAME); - if (p != NULL) { - /* - * We optionally allow setting a group name - but each algorithm only - * support one such name, so all we do is verify that it is the one we - * expected. - */ - switch (gctx->type) { - case ECX_KEY_TYPE_X25519: - groupname = "x25519"; - break; - case ECX_KEY_TYPE_X448: - groupname = "x448"; - break; - default: - /* We only support this for key exchange at the moment */ - break; - } - if (p->data_type != OSSL_PARAM_UTF8_STRING || groupname == NULL || - OPENSSL_strcasecmp(p->data, groupname) != 0) { - UADK_ERR("invalid ecx params\n"); - return UADK_P_FAIL; - } - } - p = OSSL_PARAM_locate_const(params, OSSL_KDF_PARAM_PROPERTIES); - if (p != NULL) { - if (p->data_type != OSSL_PARAM_UTF8_STRING) - return UADK_P_FAIL; - - OPENSSL_free(gctx->propq); - gctx->propq = OPENSSL_strdup(p->data); - if (gctx->propq == NULL) - return UADK_P_FAIL; - } - - return UADK_P_SUCCESS; -} - static handle_t uadk_prov_ecx_alloc_sess(int type) { struct wd_ecc_sess_setup setup = {0}; @@ -465,7 +440,7 @@ static void *ossl_ecx_gen_init(void *provctx, int selection, const OSSL_PARAM pa { OSSL_LIB_CTX *libctx = prov_libctx_of(provctx); PROV_ECX_KEYMGMT_CTX *gctx; - int ret; + int ret = UADK_P_SUCCESS; gctx = OPENSSL_zalloc(sizeof(PROV_ECX_KEYMGMT_CTX)); if (gctx == NULL) { @@ -477,7 +452,13 @@ static void *ossl_ecx_gen_init(void *provctx, int selection, const OSSL_PARAM pa gctx->type = type; gctx->selection = selection; - ret = ossl_ecx_gen_set_params(gctx, params); + if (type == ECX_KEY_TYPE_X448) { + if (get_default_x448_keymgmt().gen_set_params != NULL) + ret = get_default_x448_keymgmt().gen_set_params(gctx, params); + } else { + if (get_default_x25519_keymgmt().gen_set_params != NULL) + ret = get_default_x25519_keymgmt().gen_set_params(gctx, params); + } if (ret == UADK_P_FAIL) { UADK_ERR("failed to set ecx params\n"); OPENSSL_free(gctx); @@ -1426,6 +1407,25 @@ static const OSSL_PARAM *uadk_keymgmt_x25519_gen_settable_params(ossl_unused voi return get_default_x25519_keymgmt().gen_settable_params(genctx, provctx); } +#if OPENSSL_VERSION_NUMBER >= 0x30400000L +static int uadk_keymgmt_x25519_gen_get_params(void *genctx, OSSL_PARAM params[]) +{ + if (get_default_x25519_keymgmt().gen_get_params == NULL) + return UADK_P_FAIL; + + return get_default_x25519_keymgmt().gen_get_params(genctx, params); +} + +static const OSSL_PARAM *uadk_keymgmt_x25519_gen_gettable_params(ossl_unused void *genctx, + ossl_unused void *provctx) +{ + if (get_default_x25519_keymgmt().gen_gettable_params == NULL) + return NULL; + + return get_default_x25519_keymgmt().gen_gettable_params(genctx, provctx); +} +#endif + static int uadk_keymgmt_x25519_gen_set_template(void *genctx, void *templ) { return UADK_P_SUCCESS; diff --git a/src/uadk_prov_pkey.h b/src/uadk_prov_pkey.h index aa7a07b..e7bb089 100644 --- a/src/uadk_prov_pkey.h +++ b/src/uadk_prov_pkey.h @@ -134,14 +134,14 @@ typedef struct { #if OPENSSL_VERSION_NUMBER >= 0x30300000L /* NID for the legacy alg if there is one */ int legacy_alg; -# endif +#endif char *type_name; const char *description; OSSL_PROVIDER *prov; int refcnt; #if OPENSSL_VERSION_NUMBER < 0x30200000L void *lock; -# endif +#endif /* Constructor(s), destructor, information */ OSSL_FUNC_keymgmt_new_fn *new_fun; OSSL_FUNC_keymgmt_free_fn *free; @@ -156,7 +156,7 @@ typedef struct { #if OPENSSL_VERSION_NUMBER >= 0x30400000L OSSL_FUNC_keymgmt_gen_get_params_fn *gen_get_params; OSSL_FUNC_keymgmt_gen_gettable_params_fn *gen_gettable_params; -# endif +#endif OSSL_FUNC_keymgmt_gen_set_params_fn *gen_set_params; OSSL_FUNC_keymgmt_gen_settable_params_fn *gen_settable_params; OSSL_FUNC_keymgmt_gen_fn *gen; @@ -174,15 +174,34 @@ typedef struct { OSSL_FUNC_keymgmt_import_types_fn *import_types; #if OPENSSL_VERSION_NUMBER >= 0x30200000L OSSL_FUNC_keymgmt_import_types_ex_fn *import_types_ex; -# endif +#endif OSSL_FUNC_keymgmt_export_fn *export_fun; OSSL_FUNC_keymgmt_export_types_fn *export_types; #if OPENSSL_VERSION_NUMBER >= 0x30200000L OSSL_FUNC_keymgmt_export_types_ex_fn *export_types_ex; -# endif +#endif OSSL_FUNC_keymgmt_dup_fn *dup; } UADK_PKEY_KEYMGMT; +#if OPENSSL_VERSION_NUMBER < 0x30400000L +OSSL_CORE_MAKE_FUNC(int, keymgmt_gen_get_params, + (void *genctx, OSSL_PARAM params[])) +OSSL_CORE_MAKE_FUNC(const OSSL_PARAM *, keymgmt_gen_gettable_params, + (void *genctx, void *provctx)) +#endif + +#if OPENSSL_VERSION_NUMBER >= 0x30400000L +#define UADK_KEYMGMT_GEN_GET_PARAMS_ENTRY(nm) \ + { OSSL_FUNC_KEYMGMT_GEN_GET_PARAMS, \ + (void (*)(void))uadk_keymgmt_##nm##_gen_get_params }, +#define UADK_KEYMGMT_GEN_GETTABLE_PARAMS_ENTRY(nm) \ + { OSSL_FUNC_KEYMGMT_GEN_GETTABLE_PARAMS, \ + (void (*)(void))uadk_keymgmt_##nm##_gen_gettable_params }, +#else +#define UADK_KEYMGMT_GEN_GET_PARAMS_ENTRY(nm) +#define UADK_KEYMGMT_GEN_GETTABLE_PARAMS_ENTRY(nm) +#endif + #define UADK_PKEY_KEYMGMT_DESCR(nm, alg) \ static OSSL_FUNC_keymgmt_new_fn uadk_keymgmt_##nm##_new; \ static OSSL_FUNC_keymgmt_free_fn uadk_keymgmt_##nm##_free; \ @@ -194,6 +213,8 @@ static OSSL_FUNC_keymgmt_gen_init_fn uadk_keymgmt_##nm##_gen_init; \ static OSSL_FUNC_keymgmt_gen_set_template_fn uadk_keymgmt_##nm##_gen_set_template; \ static OSSL_FUNC_keymgmt_gen_set_params_fn uadk_keymgmt_##nm##_gen_set_params; \ static OSSL_FUNC_keymgmt_gen_settable_params_fn uadk_keymgmt_##nm##_gen_settable_params; \ +static OSSL_FUNC_keymgmt_gen_get_params_fn uadk_keymgmt_##nm##_gen_get_params; \ +static OSSL_FUNC_keymgmt_gen_gettable_params_fn uadk_keymgmt_##nm##_gen_gettable_params; \ static OSSL_FUNC_keymgmt_gen_fn uadk_keymgmt_##nm##_gen; \ static OSSL_FUNC_keymgmt_gen_cleanup_fn uadk_keymgmt_##nm##_gen_cleanup; \ static OSSL_FUNC_keymgmt_load_fn uadk_keymgmt_##nm##_load; \ @@ -218,6 +239,8 @@ const OSSL_DISPATCH uadk_##nm##_keymgmt_functions[] = { \ { OSSL_FUNC_KEYMGMT_GEN_INIT, (void (*)(void))uadk_keymgmt_##nm##_gen_init }, \ { OSSL_FUNC_KEYMGMT_GEN_SET_TEMPLATE, \ (void (*)(void))uadk_keymgmt_##nm##_gen_set_template }, \ + UADK_KEYMGMT_GEN_GET_PARAMS_ENTRY(nm) \ + UADK_KEYMGMT_GEN_GETTABLE_PARAMS_ENTRY(nm) \ { OSSL_FUNC_KEYMGMT_GEN_SET_PARAMS, \ (void (*)(void))uadk_keymgmt_##nm##_gen_set_params }, \ { OSSL_FUNC_KEYMGMT_GEN_SETTABLE_PARAMS, \ diff --git a/src/uadk_prov_rsa_kmgmt.c b/src/uadk_prov_rsa_kmgmt.c index 2da157c..208b65e 100644 --- a/src/uadk_prov_rsa_kmgmt.c +++ b/src/uadk_prov_rsa_kmgmt.c @@ -820,6 +820,25 @@ static const OSSL_PARAM *uadk_keymgmt_rsa_gen_settable_params(ossl_unused void * return get_default_rsa_keymgmt().gen_settable_params(genctx, provctx); } +#if OPENSSL_VERSION_NUMBER >= 0x30400000L +static int uadk_keymgmt_rsa_gen_get_params(void *genctx, OSSL_PARAM params[]) +{ + if (!get_default_rsa_keymgmt().gen_get_params) + return UADK_P_FAIL; + + return get_default_rsa_keymgmt().gen_get_params(genctx, params); +} + +static const OSSL_PARAM *uadk_keymgmt_rsa_gen_gettable_params(ossl_unused void *genctx, + ossl_unused void *provctx) +{ + if (!get_default_rsa_keymgmt().gen_gettable_params) + return NULL; + + return get_default_rsa_keymgmt().gen_gettable_params(genctx, provctx); +} +#endif + static void *uadk_rsa_sw_gen(void *genctx, OSSL_CALLBACK *osslcb, void *cbarg) { if (!enable_sw_offload || !get_default_rsa_keymgmt().gen) @@ -1006,6 +1025,12 @@ const OSSL_DISPATCH uadk_rsapss_keymgmt_functions[] = { (void (*)(void))uadk_keymgmt_rsa_gen_set_params }, { OSSL_FUNC_KEYMGMT_GEN_SETTABLE_PARAMS, (void (*)(void))uadk_keymgmt_rsapss_gen_settable_params }, +#if OPENSSL_VERSION_NUMBER >= 0x30400000L + { OSSL_FUNC_KEYMGMT_GEN_GET_PARAMS, + (void (*)(void))uadk_keymgmt_rsa_gen_get_params }, + { OSSL_FUNC_KEYMGMT_GEN_GETTABLE_PARAMS, + (void (*)(void))uadk_keymgmt_rsa_gen_gettable_params }, +#endif { OSSL_FUNC_KEYMGMT_GEN, (void (*)(void))uadk_keymgmt_rsa_gen }, { OSSL_FUNC_KEYMGMT_GEN_CLEANUP, (void (*)(void))uadk_keymgmt_rsa_gen_cleanup }, { OSSL_FUNC_KEYMGMT_LOAD, (void (*)(void))uadk_keymgmt_rsapss_load }, diff --git a/src/uadk_prov_sm2_kmgmt.c b/src/uadk_prov_sm2_kmgmt.c index 0085251..78937a1 100644 --- a/src/uadk_prov_sm2_kmgmt.c +++ b/src/uadk_prov_sm2_kmgmt.c @@ -315,6 +315,25 @@ static const OSSL_PARAM *uadk_keymgmt_sm2_gen_settable_params(ossl_unused void * return get_default_sm2_keymgmt().gen_settable_params(genctx, provctx); } +#if OPENSSL_VERSION_NUMBER >= 0x30400000L +static int uadk_keymgmt_sm2_gen_get_params(void *genctx, OSSL_PARAM params[]) +{ + if (!get_default_sm2_keymgmt().gen_get_params) + return UADK_P_FAIL; + + return get_default_sm2_keymgmt().gen_get_params(genctx, params); +} + +static const OSSL_PARAM *uadk_keymgmt_sm2_gen_gettable_params(ossl_unused void *genctx, + ossl_unused void *provctx) +{ + if (!get_default_sm2_keymgmt().gen_gettable_params) + return NULL; + + return get_default_sm2_keymgmt().gen_gettable_params(genctx, provctx); +} +#endif + static int uadk_prov_sm2_set_key_to_ec_key(EC_KEY *ec, struct wd_ecc_req *req) { unsigned char key_buff[ECC_POINT_SIZE(SM2_KEY_BYTES) + 1] = {0}; -- 2.43.0