diff options
| author | Pauli <ppzgs1@gmail.com> | 2021-03-10 18:28:35 +1000 |
|---|---|---|
| committer | Pauli <ppzgs1@gmail.com> | 2021-03-12 08:27:21 +1000 |
| commit | c983a0e5214db7f0a668f5e9ddda9362ca0d6ac9 (patch) | |
| tree | 3fe9b004c176e5c64300993dbbc0092274798d98 /providers/implementations/kdfs/pbkdf2.c | |
| parent | f59612fed8def965c61cdb002fa20f61943f50a0 (diff) | |
| download | openssl-new-c983a0e5214db7f0a668f5e9ddda9362ca0d6ac9.tar.gz | |
prov: add extra params argument to KDF implementations
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/14383)
Diffstat (limited to 'providers/implementations/kdfs/pbkdf2.c')
| -rw-r--r-- | providers/implementations/kdfs/pbkdf2.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/providers/implementations/kdfs/pbkdf2.c b/providers/implementations/kdfs/pbkdf2.c index ce27fe9b39..eb7b15de59 100644 --- a/providers/implementations/kdfs/pbkdf2.c +++ b/providers/implementations/kdfs/pbkdf2.c @@ -172,6 +172,9 @@ static int kdf_pbkdf2_set_ctx_params(void *vctx, const OSSL_PARAM params[]) int pkcs5; uint64_t iter, min_iter; + if (params == NULL) + return 1; + if (!ossl_prov_digest_load_from_params(&ctx->digest, params, provctx)) return 0; |