Add myself as lpcm author.

[vlc] / libs / srtp / srtp.c

diff --git a/libs/srtp/srtp.c b/libs/srtp/srtp.c
index 87a3c2e4db36ab763a0ff99a63e6467e607b7121..f2f2c95731d54dde758a89690330cb35b4f181a0 100644 (file)
--- a/libs/srtp/srtp.c
+++ b/libs/srtp/srtp.c
@@ -1,6 +1,6 @@
 /*
  * Secure RTP with libgcrypt
- * Copyright (C) 2007  Rémi Denis-Courmont <rdenis # simphalempin , com>
+ * Copyright (C) 2007  Rémi Denis-Courmont
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -392,10 +392,10 @@ static ssize_t hexstring (const char *in, uint8_t *out, size_t outlen)
 
     for (size_t i = 0; i < inlen; i += 2)
     {
-        int a = hexdigit (in[2 * i]), b = hexdigit (in[2 * i + 1]);
+        int a = hexdigit (in[i]), b = hexdigit (in[i + 1]);
         if ((a == -1) || (b == -1))
-            return EINVAL;
-        out[i] = (a << 4) | b;
+            return -1;
+        out[i / 2] = (a << 4) | b;
     }
     return inlen / 2;
 }
@@ -410,14 +410,14 @@ static ssize_t hexstring (const char *in, uint8_t *out, size_t outlen)
 int
 srtp_setkeystring (srtp_session_t *s, const char *key, const char *salt)
 {
-    uint8_t bkey[32]; /* TODO/NOTE: hard-coded for AES */
+    uint8_t bkey[16]; /* TODO/NOTE: hard-coded for AES */
     uint8_t bsalt[14]; /* TODO/NOTE: hard-coded for the PRF-AES-CM */
     ssize_t bkeylen = hexstring (key, bkey, sizeof (bkey));
     ssize_t bsaltlen = hexstring (salt, bsalt, sizeof (bsalt));
 
     if ((bkeylen == -1) || (bsaltlen == -1))
         return EINVAL;
-    return srtp_derive (s, bkey, bkeylen, bsalt, bsaltlen) ? EINVAL : 0;
+    return srtp_setkey (s, bkey, bkeylen, bsalt, bsaltlen) ? EINVAL : 0;
 }
 
 /**
@@ -600,17 +600,21 @@ int
 srtp_send (srtp_session_t *s, uint8_t *buf, size_t *lenp, size_t bufsize)
 {
     size_t len = *lenp;
-    int val = srtp_crypt (s, buf, len);
-    if (val)
-        return val;
+    size_t tag_len = s->tag_len;
 
     if (!(s->flags & SRTP_UNAUTHENTICATED))
     {
-        size_t tag_len = s->tag_len;
         *lenp = len + tag_len;
         if (bufsize < (len + tag_len))
             return ENOSPC;
+    }
 
+    int val = srtp_crypt (s, buf, len);
+    if (val)
+        return val;
+
+    if (!(s->flags & SRTP_UNAUTHENTICATED))
+    {
         uint32_t roc = srtp_compute_roc (s, rtp_seq (buf));
         const uint8_t *tag = rtp_digest (s, buf, len, roc);
         if (rcc_mode (s))