aboutsummaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2020-06-18 09:30:48 +0100
committerRichard Levitte <levitte@openssl.org>2020-07-16 14:21:07 +0200
commit660c534435e238c6bd8065c1d544a1c4d3c555a3 (patch)
treea114a104199c298b21e7670eb169df179f4e3cee /apps
parent865adf97c9b8271788ee7293ecde9e8a643a1c45 (diff)
downloadopenssl-660c534435e238c6bd8065c1d544a1c4d3c555a3.zip
openssl-660c534435e238c6bd8065c1d544a1c4d3c555a3.tar.gz
openssl-660c534435e238c6bd8065c1d544a1c4d3c555a3.tar.bz2
Revert "kdf: make function naming consistent."
The commit claimed to make things more consistent. In fact it makes it less so. Revert back to the previous namig convention. This reverts commit 765d04c9460a304c8119f57941341a149498b9db. Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org> Reviewed-by: Nicola Tuveri <nic.tuv@gmail.com> Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/12186)
Diffstat (limited to 'apps')
-rw-r--r--apps/kdf.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/kdf.c b/apps/kdf.c
index dd6cc92..8d11807 100644
--- a/apps/kdf.c
+++ b/apps/kdf.c
@@ -104,7 +104,7 @@ opthelp:
goto opthelp;
}
- ctx = EVP_KDF_new_ctx(kdf);
+ ctx = EVP_KDF_CTX_new(kdf);
if (ctx == NULL)
goto err;
@@ -116,7 +116,7 @@ opthelp:
if (params == NULL)
goto err;
- if (!EVP_KDF_set_ctx_params(ctx, params)) {
+ if (!EVP_KDF_CTX_set_params(ctx, params)) {
BIO_printf(bio_err, "KDF parameter error\n");
ERR_print_errors(bio_err);
ok = 0;
@@ -161,7 +161,7 @@ err:
OPENSSL_clear_free(dkm_bytes, dkm_len);
sk_OPENSSL_STRING_free(opts);
EVP_KDF_free(kdf);
- EVP_KDF_free_ctx(ctx);
+ EVP_KDF_CTX_free(ctx);
BIO_free(out);
OPENSSL_free(hexout);
return ret;