Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/14310)
*p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_SEED,
(void *)seed5, (size_t)seed5_len);
*p = OSSL_PARAM_construct_end();
*p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_SEED,
(void *)seed5, (size_t)seed5_len);
*p = OSSL_PARAM_construct_end();
- if (EVP_KDF_CTX_set_params(kctx, params)
- && EVP_KDF_derive(kctx, out, olen)) {
+ if (EVP_KDF_derive(kctx, out, olen, params)) {
EVP_KDF_CTX_free(kctx);
return 1;
}
EVP_KDF_CTX_free(kctx);
return 1;
}
hkdflabel, hkdflabellen);
*p++ = OSSL_PARAM_construct_end();
hkdflabel, hkdflabellen);
*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;
prevsecretlen);
*p++ = OSSL_PARAM_construct_end();
prevsecretlen);
*p++ = OSSL_PARAM_construct_end();
- ret = EVP_KDF_CTX_set_params(kctx, params) <= 0
- || EVP_KDF_derive(kctx, outsecret, mdlen) <= 0;
+ ret = EVP_KDF_derive(kctx, outsecret, mdlen, params) <= 0;
if (ret != 0)
SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
if (ret != 0)
SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);