On Thu, 28 May 2015, Luca Barbato wrote:
On 28/05/15 10:32, Martin Storsjö wrote:
---
libavformat/rtmpdh.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/libavformat/rtmpdh.c b/libavformat/rtmpdh.c
index bd9813d..80cced9 100644
--- a/libavformat/rtmpdh.c
+++ b/libavformat/rtmpdh.c
@@ -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)
{
Ok, should it go in stable?
Nah, the only caller of it passes the right hardcoded size anyway, so
there's no risk that it'd overflow - it just makes the code clearer.
// Martin
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
