diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-29 11:31:22 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-29 11:31:26 +0200 |
| commit | 4c0b30b07a81727561cafc171a1d0182a5975a48 (patch) | |
| tree | 5d9d847a1e8cbe2fb08a84d6555750d468e8bfad | |
| parent | 392832fc3ab1b506b750ec8a1bcc83e1396bc7c9 (diff) | |
| parent | 127d813bcb5705202b7100cf1eccd1e26d72ba14 (diff) | |
| download | ffmpeg-4c0b30b07a81727561cafc171a1d0182a5975a48.tar.gz | |
Merge commit '127d813bcb5705202b7100cf1eccd1e26d72ba14'
* commit '127d813bcb5705202b7100cf1eccd1e26d72ba14':
rtmpdh: Fix a local variable name in the nettle/gcrypt codepath
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/rtmpdh.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/rtmpdh.c b/libavformat/rtmpdh.c index acfa62628c..5f5c044c85 100644 --- a/libavformat/rtmpdh.c +++ b/libavformat/rtmpdh.c @@ -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) |