Merge pull request #491 from lgrahl/patch-1

paulej · web-flow · commit 72c7541b3eb3 · 2020-06-02T10:33:06.000-04:00
Fix two-byte RTP header extension encryption
diff --git a/srtp/srtp.c b/srtp/srtp.c
@@ -1423,7 +1423,7 @@ static srtp_err_status_t srtp_process_header_encryption(
                 xtn_hdr_data++;
             }
         }
-    } else if ((ntohs(xtn_hdr->profile_specific) & 0x1fff) == 0x100) {
+    } else if ((ntohs(xtn_hdr->profile_specific) & 0xfff0) == 0x1000) {
         /* RFC 5285, section 4.3. Two-Byte Header */
         while (xtn_hdr_data + 1 < xtn_hdr_end) {
             uint8_t xid = *xtn_hdr_data;

Original file line number	Diff line number	Diff line change
`@@ -1423,7 +1423,7 @@ static srtp_err_status_t srtp_process_header_encryption(`
`1423`	`1423`	`xtn_hdr_data++;`
`1424`	`1424`	`}`
`1425`	`1425`	`}`
`1426`		`- } else if ((ntohs(xtn_hdr->profile_specific) & 0x1fff) == 0x100) {`
	`1426`	`+ } else if ((ntohs(xtn_hdr->profile_specific) & 0xfff0) == 0x1000) {`
`1427`	`1427`	`/* RFC 5285, section 4.3. Two-Byte Header */`
`1428`	`1428`	`while (xtn_hdr_data + 1 < xtn_hdr_end) {`
`1429`	`1429`	`uint8_t xid = *xtn_hdr_data;`