RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '127d813bcb5705202b7100cf1eccd1e26d72ba14' 

* commit '127d813bcb5705202b7100cf1eccd1e26d72ba14':
  rtmpdh: Fix a local variable name in the nettle/gcrypt codepath

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-05-29 11:31:22 +02:00
parent 392832fc3a 127d813bcb
commit 4c0b30b07a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/rtmpdh.c
View File

@ -134,7 +134,7 @@ static FFBigNum dh_generate_key(FF_DH *dh)
}
static int dh_compute_key(FF_DH *dh, FFBigNum pub_key_bn,
uint32_t pub_key_len, uint8_t *secret_key)
uint32_t secret_key_len, uint8_t *secret_key)
{
FFBigNum k;
int num_bytes;
@ -148,11 +148,11 @@ static int dh_compute_key(FF_DH *dh, FFBigNum pub_key_bn,
return -1;
bn_modexp(k, pub_key_bn, dh->priv_key, dh->p);
bn_bn2bin(k, secret_key, pub_key_len);
bn_bn2bin(k, secret_key, secret_key_len);
bn_free(k);
/* return the length of the shared secret key like DH_compute_key */
return pub_key_len;
return secret_key_len;
}
void ff_dh_free(FF_DH *dh)