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/rtmpcrypt.c | |
| parent | beecbe13a2ea49280554a7178bebc525e538b4e7 (diff) | |
| parent | 0508faaa11bf7507ffdd655aee57c9dc5a8203f4 (diff) | |
| download | ffmpeg-fbeb3fa999e8712af35f1d898ca0b0cbab707556.tar.gz | |
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/rtmpcrypt.c')
| -rw-r--r-- | libavformat/rtmpcrypt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/rtmpcrypt.c b/libavformat/rtmpcrypt.c index 2312527d37..2065ec6602 100644 --- a/libavformat/rtmpcrypt.c +++ b/libavformat/rtmpcrypt.c @@ -163,7 +163,7 @@ int ff_rtmpe_compute_secret_key(URLContext *h, const uint8_t *serverdata, /* compute the shared secret secret in order to compute RC4 keys */ if ((ret = ff_dh_compute_shared_secret_key(rt->dh, serverdata + server_pos, - 128, secret_key)) < 0) + 128, secret_key, sizeof(secret_key))) < 0) return ret; /* set output key */ |