admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "srtp: use SRTP_SRCTP_INDEX_LEN define from libsrtp 2.6.0"

Browse Source 
This reverts commit 7738bc23ed7fee0d4856bdfe7b88985865829441.

Reason for revert: Some downstream projects are still using an older version of libsrtp

Original change's description:
> srtp: use SRTP_SRCTP_INDEX_LEN define from libsrtp 2.6.0
>
> BUG=webrtc:42222036
>
> Change-Id: Ibf5c6b200501c114b9709b76685bb0ecd30bf9fb
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/359627
> Commit-Queue: Philipp Hancke <phancke@meta.com>
> Reviewed-by: Harald Alvestrand <hta@webrtc.org>
> Reviewed-by: Henrik Boström <hbos@webrtc.org>
> Cr-Commit-Position: refs/heads/main@{#43538}

Bug: webrtc:42222036
Change-Id: Icdac768bd4ccb6f1f4ada68637c0b979aefc39f6
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/371240
Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com>
Owners-Override: Jeremy Leconte <jleconte@webrtc.org>
Commit-Queue: Jeremy Leconte <jleconte@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#43544}
This commit is contained in:
Jeremy Leconte 2024-12-11 23:54:07 -08:00 committed by WebRTC LUCI CQ
parent ef35daf744
commit 56395a63c2
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pc/srtp_session.cc
View File

@ -249,7 +249,7 @@ bool SrtpSession::ProtectRtcp(void* p, int in_len, int max_len, int* out_len) {
// SRTP_MAX_TRAILER_LEN bytes of free space after the data. WebRTC
// never includes a MKI, therefore the amount of bytes added by the
// srtp_protect_rtp call is known in advance and depends on the cipher suite.
int need_len = in_len + SRTP_SRCTP_INDEX_LEN + rtcp_auth_tag_len_;
int need_len = in_len + sizeof(uint32_t) + rtcp_auth_tag_len_; // NOLINT
if (max_len < need_len) {
RTC_LOG(LS_WARNING) << "Failed to protect SRTCP packet: The buffer length "
<< max_len << " is less than the needed " << need_len;