summaryrefslogtreecommitdiffstats
path: root/providers
diff options
context:
space:
mode:
authorJon Spillett <jon.spillett@oracle.com>2021-05-06 15:25:29 +1000
committerPauli <pauli@openssl.org>2021-05-24 15:21:25 +1000
commit8bb6fdfc9971557f3aaa4e5dfc4cab0e5e9220a6 (patch)
tree7151ffe947ac709db23b80952bca3a97f4722d7d /providers
parent0f183675b8ea2490ca5e0b4e66baa27a3e6478ba (diff)
Added PKCS5_PBE_keyivgen_ex() to allow PBKDF1 algorithms to be fetched for a specific library context
Reviewed-by: Shane Lontis <shane.lontis@oracle.com> Reviewed-by: Paul Dale <pauli@openssl.org> (Merged from https://github.com/openssl/openssl/pull/14326)
Diffstat (limited to 'providers')
-rw-r--r--providers/implementations/kdfs/pbkdf1.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/providers/implementations/kdfs/pbkdf1.c b/providers/implementations/kdfs/pbkdf1.c
index 1a803774d6..af715efc91 100644
--- a/providers/implementations/kdfs/pbkdf1.c
+++ b/providers/implementations/kdfs/pbkdf1.c
@@ -175,9 +175,9 @@ static int kdf_pbkdf1_set_ctx_params(void *vctx, const OSSL_PARAM params[])
{
const OSSL_PARAM *p;
KDF_PBKDF1 *ctx = vctx;
- OSSL_LIB_CTX *provctx = PROV_LIBCTX_OF(ctx->provctx);
+ OSSL_LIB_CTX *libctx = PROV_LIBCTX_OF(ctx->provctx);
- if (!ossl_prov_digest_load_from_params(&ctx->digest, params, provctx))
+ if (!ossl_prov_digest_load_from_params(&ctx->digest, params, libctx))
return 0;
if ((p = OSSL_PARAM_locate_const(params, OSSL_KDF_PARAM_PASSWORD)) != NULL)