summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorPauli <ppzgs1@gmail.com>2021-02-26 10:06:11 +1000
committerPauli <ppzgs1@gmail.com>2021-02-28 17:25:49 +1000
commit7c75f2daf8b50c92bfb5c17fa62136e61f6eb515 (patch)
tree9b8c91e5ad7e2c9b5029aac658a184223cb947ec /crypto
parenta9603292fb77349ba144f38612d88af07107396a (diff)
evp: add param argument to KDF derive call
Reviewed-by: Shane Lontis <shane.lontis@oracle.com> (Merged from https://github.com/openssl/openssl/pull/14310)
Diffstat (limited to 'crypto')
-rw-r--r--crypto/evp/kdf_lib.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/crypto/evp/kdf_lib.c b/crypto/evp/kdf_lib.c
index 36f8eb2ea8..5fe022a142 100644
--- a/crypto/evp/kdf_lib.c
+++ b/crypto/evp/kdf_lib.c
@@ -137,12 +137,13 @@ size_t EVP_KDF_CTX_get_kdf_size(EVP_KDF_CTX *ctx)
return 0;
}
-int EVP_KDF_derive(EVP_KDF_CTX *ctx, unsigned char *key, size_t keylen)
+int EVP_KDF_derive(EVP_KDF_CTX *ctx, unsigned char *key, size_t keylen,
+ const OSSL_PARAM params[])
{
if (ctx == NULL)
return 0;
- return ctx->meth->derive(ctx->data, key, keylen);
+ return ctx->meth->derive(ctx->data, key, keylen, params);
}
/*