diff options
| author | Pauli <paul.dale@oracle.com> | 2020-06-09 01:10:41 +0200 |
|---|---|---|
| committer | Pauli <paul.dale@oracle.com> | 2020-06-11 03:14:21 +0200 |
| commit | 765d04c9460a304c8119f57941341a149498b9db (patch) | |
| tree | ebbf22a15cb6976260f84fa7747d02dd923393c4 /test/evp_test.c | |
| parent | Make it clear that you can't use all ciphers for CMAC (diff) | |
| download | openssl-765d04c9460a304c8119f57941341a149498b9db.tar.xz openssl-765d04c9460a304c8119f57941341a149498b9db.zip | |
kdf: make function naming consistent.
The EVP_KDF_CTX_* functions have been relocated to the EVP_KDF_* namespace
for consistency.
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/11996)
Diffstat (limited to 'test/evp_test.c')
| -rw-r--r-- | test/evp_test.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/test/evp_test.c b/test/evp_test.c index 6ed5bafba6..198c27ea5f 100644 --- a/test/evp_test.c +++ b/test/evp_test.c @@ -2095,7 +2095,7 @@ static int kdf_test_init(EVP_TEST *t, const char *name) 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); @@ -2113,7 +2113,7 @@ static void kdf_test_cleanup(EVP_TEST *t) 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, @@ -2122,7 +2122,8 @@ 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; @@ -2178,7 +2179,7 @@ static int kdf_test_run(EVP_TEST *t) 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; } |