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/dh | |
| 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/dh')
| -rw-r--r-- | crypto/dh/dh_kdf.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/crypto/dh/dh_kdf.c b/crypto/dh/dh_kdf.c index e1753b0b69..03e45aead9 100644 --- a/crypto/dh/dh_kdf.c +++ b/crypto/dh/dh_kdf.c @@ -53,8 +53,7 @@ int ossl_dh_kdf_X9_42_asn1(unsigned char *out, size_t outlen, *p++ = OSSL_PARAM_construct_utf8_string(OSSL_KDF_PARAM_CEK_ALG, (char *)cek_alg, 0); *p = OSSL_PARAM_construct_end(); - ret = EVP_KDF_CTX_set_params(kctx, params) > 0 - && EVP_KDF_derive(kctx, out, outlen) > 0; + ret = EVP_KDF_derive(kctx, out, outlen, params) > 0; err: EVP_KDF_CTX_free(kctx); EVP_KDF_free(kdf); |