diff options
| author | Pauli <ppzgs1@gmail.com> | 2021-02-26 10:08:45 +1000 |
|---|---|---|
| committer | Pauli <ppzgs1@gmail.com> | 2021-02-28 17:25:49 +1000 |
| commit | 36fae6e85a12c46b48d82762911c74e53ec0cc13 (patch) | |
| tree | c7807d0bb33d82ee69931bc54f3ab9c7cd2f790e /crypto/evp/p5_crpt2.c | |
| parent | bb0ab821f38427576e4f25bb66818bc297ee8b22 (diff) | |
crypto: add additional argument to KDF derive calls
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/14310)
Diffstat (limited to 'crypto/evp/p5_crpt2.c')
| -rw-r--r-- | crypto/evp/p5_crpt2.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/crypto/evp/p5_crpt2.c b/crypto/evp/p5_crpt2.c index c097210bd4..dff3310ded 100644 --- a/crypto/evp/p5_crpt2.c +++ b/crypto/evp/p5_crpt2.c @@ -55,8 +55,7 @@ int pkcs5_pbkdf2_hmac_ex(const char *pass, int passlen, *p++ = OSSL_PARAM_construct_utf8_string(OSSL_KDF_PARAM_DIGEST, (char *)mdname, 0); *p = OSSL_PARAM_construct_end(); - if (EVP_KDF_CTX_set_params(kctx, params) != 1 - || EVP_KDF_derive(kctx, out, keylen) != 1) + if (EVP_KDF_derive(kctx, out, keylen, params) != 1) rv = 0; EVP_KDF_CTX_free(kctx); |