diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-29 11:31:55 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-29 11:32:07 +0200 |
| commit | fbeb3fa999e8712af35f1d898ca0b0cbab707556 (patch) | |
| tree | ee9113b8c848d4ac68e4d8e873116dd285891272 /libavformat/rtmpdh.c | |
| parent | beecbe13a2ea49280554a7178bebc525e538b4e7 (diff) | |
| parent | 0508faaa11bf7507ffdd655aee57c9dc5a8203f4 (diff) | |
Merge commit '0508faaa11bf7507ffdd655aee57c9dc5a8203f4'
* commit '0508faaa11bf7507ffdd655aee57c9dc5a8203f4':
rtmpdh: Pass the actual buffer size of the output secret key
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtmpdh.c')
| -rw-r--r-- | libavformat/rtmpdh.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavformat/rtmpdh.c b/libavformat/rtmpdh.c index 894b7d5ccd..337341db81 100644 --- a/libavformat/rtmpdh.c +++ b/libavformat/rtmpdh.c @@ -313,7 +313,8 @@ int ff_dh_write_public_key(FF_DH *dh, uint8_t *pub_key, int pub_key_len) } int ff_dh_compute_shared_secret_key(FF_DH *dh, const uint8_t *pub_key, - int pub_key_len, uint8_t *secret_key) + int pub_key_len, uint8_t *secret_key, + int secret_key_len) { FFBigNum q1 = NULL, pub_key_bn = NULL; int ret; @@ -333,7 +334,7 @@ int ff_dh_compute_shared_secret_key(FF_DH *dh, const uint8_t *pub_key, /* when the public key is valid we have to compute the shared secret key */ if ((ret = dh_is_valid_public_key(pub_key_bn, dh->p, q1)) < 0) { goto fail; - } else if ((ret = dh_compute_key(dh, pub_key_bn, pub_key_len, + } else if ((ret = dh_compute_key(dh, pub_key_bn, secret_key_len, secret_key)) < 0) { ret = AVERROR(EINVAL); goto fail; |