diff options
| author | Pauli <ppzgs1@gmail.com> | 2021-02-26 01:08:45 +0100 |
|---|---|---|
| committer | Pauli <ppzgs1@gmail.com> | 2021-02-28 08:25:49 +0100 |
| commit | 36fae6e85a12c46b48d82762911c74e53ec0cc13 (patch) | |
| tree | c7807d0bb33d82ee69931bc54f3ab9c7cd2f790e /crypto/evp/pbe_scrypt.c | |
| parent | apps: add addition argument to KDF derive call (diff) | |
| download | openssl-36fae6e85a12c46b48d82762911c74e53ec0cc13.tar.xz openssl-36fae6e85a12c46b48d82762911c74e53ec0cc13.zip | |
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/pbe_scrypt.c')
| -rw-r--r-- | crypto/evp/pbe_scrypt.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/crypto/evp/pbe_scrypt.c b/crypto/evp/pbe_scrypt.c index f7656324f6..be881b32fb 100644 --- a/crypto/evp/pbe_scrypt.c +++ b/crypto/evp/pbe_scrypt.c @@ -79,8 +79,7 @@ int EVP_PBE_scrypt(const char *pass, size_t passlen, *z++ = OSSL_PARAM_construct_uint64(OSSL_KDF_PARAM_SCRYPT_P, &p); *z++ = OSSL_PARAM_construct_uint64(OSSL_KDF_PARAM_SCRYPT_MAXMEM, &maxmem); *z = OSSL_PARAM_construct_end(); - if (EVP_KDF_CTX_set_params(kctx, params) != 1 - || EVP_KDF_derive(kctx, key, keylen) != 1) + if (EVP_KDF_derive(kctx, key, keylen, params) != 1) rv = 0; EVP_KDF_CTX_free(kctx); |