Changeset 263b77a37a173ae8ed008b959ae54d1d48f09f77

Timestamp:

11/03/07 14:18:05 (2 years ago)

Author:

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

git-committer:

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

git-parent:

[56e9569c94674100e92c395deac7ca3b9baaf9ea]

git-author:

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

Message:

API cleanup

Files:

• libs/srtp/recv.c (modified) (1 diff)
• libs/srtp/srtp.c (modified) (6 diffs)
• libs/srtp/srtp.h (modified) (2 diffs)

libs/srtp/recv.c

@@ -52 +52 @@
-        "\x12\x34\x56\x78\x90" "\x12\x34\x56\x78\x90" "\x12\x34\x56\x78";
-
-
+
+
-    if (s == NULL)
-        return 1;

libs/srtp/srtp.c

@@ -62 +62 @@
-    uint32_t rtp_roc;
-    uint16_t rtp_seq;
+    uint16_t rtp_rcc;
-    uint8_t  tag_len;
-};
@@ -74 +75 @@
-    SRTCP_SALT
-};
+
-
-#ifdef WIN32
@@ -160 +162 @@
- * multiple simultaneous sessions with the same master key.
- *
-
-
+
+
+
- * @param flags OR'ed optional flags.
- *
@@ -167 +170 @@
- */
-srtp_session_t *
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-        return NULL;
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        return NULL;
-
@@ -195 +216 @@
-    memset (s, 0, sizeof (*s));
-    s->flags = flags;
-    s->kdr = kdr;
-    s->tag_len = tag_len;
-
@@ -337 +357 @@
-
-
+/**
+ * Sets Roll-over-Counter Carry (RCC) rate for the SRTP session. If not
+ * specified (through this function), the default rate of ONE is assumed
+ * (i.e. every RTP packets will carry the RoC). RCC rate is ignored if none
+ * of the RCC mode has been selected.
+ *
+ * The RCC mode is selected through one of these flags for srtp_create():
+ *  SRTP_RCC_MODE1: integrity protection only for RoC carrying packets
+ *  SRTP_RCC_MODE2: integrity protection for all packets
+ *  SRTP_RCC_MODE3: no integrity protection
+ *
+ * RCC mode 3 is insecure. Compared to plain RTP, it provides confidentiality
+ * (through encryption) but is much more prone to DoS. It can only be used if
+ * anti-spoofing protection is provided by lower network layers (e.g. IPsec,
+ * or trusted routers and proper source address filtering).
+ *
+ * If RCC rate is 1, RCC mode 1 and 2 are functionally identical.
+ *
+ * @param rate RoC Carry rate (MUST NOT be zero)
+ */
+void srtp_setrcc_rate (srtp_session_t *s, uint16_t rate)
+{
+    assert (rate != 0);
+    s->rtp_rcc = rate;
+}
+
+
-/** AES-CM encryption/decryption (ctr length = 16 bytes) */
-static int

libs/srtp/srtp.h

@@ -25 +25 @@
-enum
-{
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-};
-
+/* SRTP encryption algorithms (ciphers); same values as MIKEY */
+enum
+{
+    SRTP_ENCR_NULL=0,
+    SRTP_ENCR_AES_CM=1,
+    SRTP_ENCR_AES_F8=2 // not implemented
+};
+
+/* SRTP authenticaton algorithms; same values as MIKEY */
+enum
+{
+    SRTP_AUTH_NULL=0,
+    SRTP_AUTH_HMAC_SHA1=1
+};
+
+/* SRTP pseudo random function; same values as MIKEY */
+enum
+{
+    SRTP_PRF_AES_CM=0
+};
-
-# ifdef __cplusplus
@@ -37 +61 @@
-# endif
-
-
+
+
-void srtp_destroy (srtp_session_t *s);
+
-int srtp_setkey (srtp_session_t *s, const void *key, size_t keylen,
-                 const void *salt, size_t saltlen);
+void srtp_setrcc_rate (srtp_session_t *s, uint16_t rate);
-
-int srtp_send (srtp_session_t *s, uint8_t *buf, size_t *lenp, size_t maxsize);