}
params[params_n] = OSSL_PARAM_construct_end();
- if ((ctx = EVP_MAC_CTX_new(expected->mac)) == NULL) {
+ if ((ctx = EVP_MAC_new_ctx(expected->mac)) == NULL) {
t->err = "MAC_CREATE_ERROR";
goto err;
}
- if (!EVP_MAC_CTX_set_params(ctx, params)) {
+ if (!EVP_MAC_set_ctx_params(ctx, params)) {
t->err = "MAC_BAD_PARAMS";
goto err;
}
while (params_n-- > params_n_allocstart) {
OPENSSL_free(params[params_n].data);
}
- EVP_MAC_CTX_free(ctx);
+ EVP_MAC_free_ctx(ctx);
OPENSSL_free(got);
return 1;
}
OPENSSL_free(kdata);
return 0;
}
- kdata->ctx = EVP_KDF_CTX_new(kdf);
+ kdata->ctx = EVP_KDF_new_ctx(kdf);
EVP_KDF_free(kdf);
if (kdata->ctx == NULL) {
OPENSSL_free(kdata);
for (p = kdata->params; p->key != NULL; p++)
OPENSSL_free(p->data);
OPENSSL_free(kdata->output);
- EVP_KDF_CTX_free(kdata->ctx);
+ EVP_KDF_free_ctx(kdata->ctx);
}
static int kdf_test_ctrl(EVP_TEST *t, EVP_KDF_CTX *kctx,
KDF_DATA *kdata = t->data;
int rv;
char *p, *name;
- const OSSL_PARAM *defs = EVP_KDF_settable_ctx_params(EVP_KDF_CTX_kdf(kctx));
+ const OSSL_PARAM *defs =
+ EVP_KDF_settable_ctx_params(EVP_KDF_get_ctx_kdf(kctx));
if (!TEST_ptr(name = OPENSSL_strdup(value)))
return 0;
unsigned char *got = NULL;
size_t got_len = expected->output_len;
- if (!EVP_KDF_CTX_set_params(expected->ctx, expected->params)) {
+ if (!EVP_KDF_set_ctx_params(expected->ctx, expected->params)) {
t->err = "KDF_CTRL_ERROR";
return 1;
}