Changeset 0eeb4286f4b713f9c443f493185535afe34866aa

Timestamp:

03/10/07 21:15:36 (1 year ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1173557736 +0000

git-parent:

[5c09dbbad9c76ea76d7060b0fee10b7d3c8abb3a]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1173557736 +0000

Message:

Ahem. Fix crappy previous commit.

Files:

• libs/srtp/srtp.c (modified) (4 diffs)

libs/srtp/srtp.c

@@ -601 +601 @@
-        return EINVAL;
-
-
-
-
-
+
+
+
+
+
+
+
+
-    if (s->flags & SRTCP_UNENCRYPTED)
-        return 0;
@@ -638 +642 @@
-        return ENOSPC;
-
-
+
+
+
+
-    if ((s->flags & SRTCP_UNENCRYPTED) == 0)
-        index |= 0x80000000; /* Set Encrypted bit */
@@ -647 +654 @@
-        return val;
-
-
+s
-
-    const uint8_t *tag = rtcp_digest (s->rtp.mac, buf, len);
-    memcpy (buf + len, tag, s->tag_len);
-    *lenp = len + s->tag_len;
-    s->rtcp_index++; /* Update index */
-    return 0;
-}
@@ -684 +690 @@
-
-    len -= 4; /* Remove SRTCP index before decryption */
-    uint32_t index;
-    memcpy (&index, buf + len, 4);
-    index = ntohl (index);
-    if (((index - s->rtcp_index) & 0xffffffff) < 0x80000000)
-        s->rtcp_index = index; /* Update index */
-
-    *lenp = len;
-    return srtp_crypt (s, buf, len);