virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

rtpdec/srtp: Handle CSRC fields being present

Browse Source 
This is untested in practice, but follows the spec.

Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Martin Storsjö
2013-01-20 19:00:18 +02:00
parent a76bc3bc44
commit f53490cc0c
2 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libavformat/rtpdec.c
View File

@@ -575,11 +575,12 @@ static int rtp_parse_packet_internal(RTPDemuxContext *s, AVPacket *pkt,
{ {
unsigned int ssrc; unsigned int ssrc;
int payload_type, seq, flags = 0; int payload_type, seq, flags = 0;
int ext; int ext, csrc;
AVStream *st; AVStream *st;
uint32_t timestamp; uint32_t timestamp;
int rv = 0; int rv = 0;
csrc = buf[0] & 0x0f;
ext = buf[0] & 0x10; ext = buf[0] & 0x10;
payload_type = buf[1] & 0x7f; payload_type = buf[1] & 0x7f;
if (buf[1] & 0x80) if (buf[1] & 0x80)
@@ -613,6 +614,11 @@ static int rtp_parse_packet_internal(RTPDemuxContext *s, AVPacket *pkt,
len -= 12; len -= 12;
buf += 12; buf += 12;
len -= 4 * csrc;
buf += 4 * csrc;
if (len < 0)
return AVERROR_INVALIDDATA;
/* RFC 3550 Section 5.3.1 RTP Header Extension handling */ /* RFC 3550 Section 5.3.1 RTP Header Extension handling */
if (ext) { if (ext) {
if (len < 4) if (len < 4)
@@ -633,8 +639,6 @@ static int rtp_parse_packet_internal(RTPDemuxContext *s, AVPacket *pkt,
s->st, pkt, &timestamp, buf, len, seq, s->st, pkt, &timestamp, buf, len, seq,
flags); flags);
} else if (st) { } else if (st) {
/* At this point, the RTP header has been stripped;
* This is ASSUMING that there is only 1 CSRC, which isn't wise. */
if ((rv = av_new_packet(pkt, len)) < 0) if ((rv = av_new_packet(pkt, len)) < 0)
return rv; return rv;
memcpy(pkt->data, buf, len); memcpy(pkt->data, buf, len);

15
libavformat/srtp.c
View File

@@ -190,16 +190,23 @@ int ff_srtp_decrypt(struct SRTPContext *s, uint8_t *buf, int *lenptr)
if (!(srtcp_index & 0x80000000)) if (!(srtcp_index & 0x80000000))
return 0; return 0;
} else { } else {
int csrc;
s->seq_initialized = 1; s->seq_initialized = 1;
s->seq_largest = seq_largest; s->seq_largest = seq_largest;
s->roc = roc; s->roc = roc;
csrc = buf[0] & 0x0f;
ext = buf[0] & 0x10; ext = buf[0] & 0x10;
ssrc = AV_RB32(buf + 8); ssrc = AV_RB32(buf + 8);
buf += 12; buf += 12;
len -= 12; len -= 12;
buf += 4 * csrc;
len -= 4 * csrc;
if (len < 0)
return AVERROR_INVALIDDATA;
if (ext) { if (ext) {
if (len < 4) if (len < 4)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
@@ -244,7 +251,7 @@ int ff_srtp_encrypt(struct SRTPContext *s, const uint8_t *in, int len,
buf += 8; buf += 8;
len -= 8; len -= 8;
} else { } else {
int ext; int ext, csrc;
int seq = AV_RB16(buf + 2); int seq = AV_RB16(buf + 2);
ssrc = AV_RB32(buf + 8); ssrc = AV_RB32(buf + 8);
@@ -253,11 +260,17 @@ int ff_srtp_encrypt(struct SRTPContext *s, const uint8_t *in, int len,
s->seq_largest = seq; s->seq_largest = seq;
index = seq + (((uint64_t)s->roc) << 16); index = seq + (((uint64_t)s->roc) << 16);
csrc = buf[0] & 0x0f;
ext = buf[0] & 0x10; ext = buf[0] & 0x10;
buf += 12; buf += 12;
len -= 12; len -= 12;
buf += 4 * csrc;
len -= 4 * csrc;
if (len < 0)
return AVERROR_INVALIDDATA;
if (ext) { if (ext) {
if (len < 4) if (len < 4)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;