From b1e9169ecea5f9ea81d00ba4b51606b2f329c956 Mon Sep 17 00:00:00 2001 From: Dmitry Belyavskiy Date: Mon, 6 Jan 2025 17:15:50 +0100 Subject: [PATCH] xxx --- crypto/evp/s_lib.c | 2 +- crypto/evp/skeymgmt_meth.c | 4 ++-- include/crypto/evp.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/crypto/evp/s_lib.c b/crypto/evp/s_lib.c index d33d3f79a6cc6f..b17cdb7255832f 100644 --- a/crypto/evp/s_lib.c +++ b/crypto/evp/s_lib.c @@ -71,7 +71,7 @@ EVP_SKEY *EVP_SKEY_new_fromdata(OSSL_LIB_CTX *libctx, const char *skeymgmtname, } skey->skeymgmt = skeymgmt; - if (!evp_skeymgmt_import(skey->skeymgmt, &keydata, params)) { + if (!evp_skeymgmt_import(skey->skeymgmt, keydata, params)) { evp_skeymgmt_freedata(skey->skeymgmt, keydata); keydata = NULL; goto err; diff --git a/crypto/evp/skeymgmt_meth.c b/crypto/evp/skeymgmt_meth.c index e73d9f3bed07a6..86a4c572c3ff2f 100644 --- a/crypto/evp/skeymgmt_meth.c +++ b/crypto/evp/skeymgmt_meth.c @@ -17,12 +17,12 @@ #include "crypto/evp.h" #include "evp_local.h" -int evp_skeymgmt_import(const EVP_SKEYMGMT *skeymgmt, void **keydata, +int evp_skeymgmt_import(const EVP_SKEYMGMT *skeymgmt, void *keydata, const OSSL_PARAM params[]) { if (skeymgmt->import == NULL) return 0; - return skeymgmt->import(keydata, params); + return skeymgmt->import(&keydata, params); } int evp_skeymgmt_export(const EVP_SKEYMGMT *skeymgmt, void *keydata, diff --git a/include/crypto/evp.h b/include/crypto/evp.h index 73c4e2ecff30e0..799f006902459b 100644 --- a/include/crypto/evp.h +++ b/include/crypto/evp.h @@ -875,7 +875,7 @@ EVP_KEYMGMT *evp_keymgmt_fetch_from_prov(OSSL_PROVIDER *prov, * SKEYMGMT provider interface functions */ void evp_skeymgmt_freedata(const EVP_SKEYMGMT *keymgmt, void *keyddata); -int evp_skeymgmt_import(const EVP_SKEYMGMT *skeymgmt, void **keydata, +int evp_skeymgmt_import(const EVP_SKEYMGMT *skeymgmt, void *keydata, const OSSL_PARAM params[]); int evp_skeymgmt_export(const EVP_SKEYMGMT *skeymgmt, void *keydata, int selection, OSSL_CALLBACK *param_cb, void *cbarg);