mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-01-13 21:28:01 +02:00
Merge commit '9f1b3050d9e31e9283d818f3640f3460ac8cfb5b'
* commit '9f1b3050d9e31e9283d818f3640f3460ac8cfb5b': rtmpdh: Check the output buffer size in the openssl version of dh_compute_key Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
beecbe13a2
@ -189,7 +189,14 @@ void ff_dh_free(FF_DH *dh)
|
||||
|
||||
#define dh_new() DH_new()
|
||||
#define dh_generate_key(dh) DH_generate_key(dh)
|
||||
#define dh_compute_key(dh, pub, len, secret) DH_compute_key(secret, pub, dh)
|
||||
|
||||
static int dh_compute_key(FF_DH *dh, FFBigNum pub_key_bn,
|
||||
uint32_t secret_key_len, uint8_t *secret_key)
|
||||
{
|
||||
if (secret_key_len < DH_size(dh))
|
||||
return AVERROR(EINVAL);
|
||||
return DH_compute_key(secret_key, pub_key_bn, dh);
|
||||
}
|
||||
|
||||
void ff_dh_free(FF_DH *dh)
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user