*/
#include <string.h>
+#include <openssl/core_names.h>
#include <openssl/ec.h>
#include <openssl/evp.h>
#include <openssl/kdf.h>
const unsigned char *sinfo, size_t sinfolen,
const EVP_MD *md)
{
- int ret;
+ int ret = 0;
EVP_KDF_CTX *kctx = NULL;
+ OSSL_PARAM params[4], *p = params;
+ const char *mdname = EVP_MD_name(md);
+ EVP_KDF *kdf = EVP_KDF_fetch(NULL, OSSL_KDF_NAME_X963KDF, NULL);
- kctx = EVP_KDF_CTX_new(EVP_get_kdfbyname(SN_x963kdf));
- ret =
- kctx != NULL
- && EVP_KDF_ctrl(kctx, EVP_KDF_CTRL_SET_MD, md) > 0
- && EVP_KDF_ctrl(kctx, EVP_KDF_CTRL_SET_KEY, Z, Zlen) > 0
- && EVP_KDF_ctrl(kctx, EVP_KDF_CTRL_SET_SHARED_INFO, sinfo, sinfolen) > 0
- && EVP_KDF_derive(kctx, out, outlen) > 0;
+ if ((kctx = EVP_KDF_CTX_new(kdf)) != NULL) {
+ *p++ = OSSL_PARAM_construct_utf8_string(OSSL_KDF_PARAM_DIGEST,
+ (char *)mdname,
+ strlen(mdname) + 1);
+ *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_KEY,
+ (void *)Z, Zlen);
+ *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_INFO,
+ (void *)sinfo, sinfolen);
+ *p = OSSL_PARAM_construct_end();
- EVP_KDF_CTX_free(kctx);
+ ret = EVP_KDF_CTX_set_params(kctx, params) > 0
+ && EVP_KDF_derive(kctx, out, outlen) > 0;
+ EVP_KDF_CTX_free(kctx);
+ }
+ EVP_KDF_free(kdf);
return ret;
}