projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
prov: add extra params argument to KDF implementations
[openssl.git]
/
providers
/
implementations
/
kdfs
/
pbkdf2.c
diff --git
a/providers/implementations/kdfs/pbkdf2.c
b/providers/implementations/kdfs/pbkdf2.c
index 9d993dc545094363e4c58d7e3b2e7c44b9db232c..ce27fe9b393e15fe6f8f5ec6fca8b838102479db 100644
(file)
--- a/
providers/implementations/kdfs/pbkdf2.c
+++ b/
providers/implementations/kdfs/pbkdf2.c
@@
-139,13
+139,13
@@
static int pbkdf2_set_membuf(unsigned char **buffer, size_t *buflen,
return 1;
}
return 1;
}
-static int kdf_pbkdf2_derive(void *vctx, unsigned char *key,
-
size_t keylen
)
+static int kdf_pbkdf2_derive(void *vctx, unsigned char *key,
size_t keylen,
+
const OSSL_PARAM params[]
)
{
KDF_PBKDF2 *ctx = (KDF_PBKDF2 *)vctx;
const EVP_MD *md;
{
KDF_PBKDF2 *ctx = (KDF_PBKDF2 *)vctx;
const EVP_MD *md;
- if (!ossl_prov_is_running())
+ if (!ossl_prov_is_running()
|| !kdf_pbkdf2_set_ctx_params(ctx, params)
)
return 0;
if (ctx->pass == NULL) {
return 0;
if (ctx->pass == NULL) {