Skip to content

srtp: fix for possible sequence number corruption on wrap around boun… #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

srtp: fix for possible sequence number corruption on wrap around boun… #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a0fe29f
srtp: fix for possible sequence number corruption on wrap around boun…
May 31, 2018
d2a64fb
srtp: SRTP_WINDOW_SIZE is macro and may be redefined upon build
Jun 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/srtp/replay.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
#include "srtp.h"


enum {
SRTP_WINDOW_SIZE = 64
};
#ifndef SRTP_WINDOW_SIZE
#define SRTP_WINDOW_SIZE (64) /**< Maximum number of packets in replay buffer */
#endif


void srtp_replay_init(struct replay *replay)
Expand Down
6 changes: 4 additions & 2 deletions src/srtp/srtp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@ int srtp_encrypt(struct srtp *srtp, struct mbuf *mb)
size_t start;
uint64_t ix;
int err;
int diff;

if (!srtp || !mb)
return EINVAL;
Expand All @@ -168,7 +169,8 @@ int srtp_encrypt(struct srtp *srtp, struct mbuf *mb)
return err;

/* Roll-Over Counter (ROC) */
if (seq_diff(strm->s_l, hdr.seq) <= -32768) {
diff = seq_diff(strm->s_l, hdr.seq);
if (diff <= -32768) {
strm->roc++;
strm->s_l = 0;
}
Expand Down Expand Up @@ -211,7 +213,7 @@ int srtp_encrypt(struct srtp *srtp, struct mbuf *mb)
return err;
}

if (hdr.seq > strm->s_l)
if (diff > 0 && (strm->roc == 0 || diff < 32768))
strm->s_l = hdr.seq;

mb->pos = start;
Expand Down