Changeset 8650df15a2468f76f2af570b32c5936f42c9cdb8

Show
Ignore:
Timestamp:
06/15/08 21:06:54 (3 months ago)
Author:
Rémi Denis-Courmont <rdenis@simphalempin.com>
git-committer:
Rémi Denis-Courmont <rdenis@simphalempin.com> 1213556814 +0300
git-parent:

[60e93de0e96977d7cced502ad5236d7bbaa18366]

git-author:
Rémi Denis-Courmont <rdenis@simphalempin.com> 1213554235 +0300
Message:

SRTP: fix parser

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • libs/srtp/srtp.c

    r7788eb7 r8650df1  
    393393    for (size_t i = 0; i < inlen; i += 2) 
    394394    { 
    395         int a = hexdigit (in[2 * i]), b = hexdigit (in[2 * i + 1]); 
     395        int a = hexdigit (in[i]), b = hexdigit (in[i + 1]); 
    396396        if ((a == -1) || (b == -1)) 
    397             return EINVAL; 
    398         out[i] = (a << 4) | b; 
     397            return -1; 
     398        out[i / 2] = (a << 4) | b; 
    399399    } 
    400400    return inlen / 2; 
    …… 
    411411srtp_setkeystring (srtp_session_t *s, const char *key, const char *salt) 
    412412{ 
    413     uint8_t bkey[32]; /* TODO/NOTE: hard-coded for AES */ 
     413    uint8_t bkey[16]; /* TODO/NOTE: hard-coded for AES */ 
    414414    uint8_t bsalt[14]; /* TODO/NOTE: hard-coded for the PRF-AES-CM */ 
    415415    ssize_t bkeylen = hexstring (key, bkey, sizeof (bkey)); 
    …… 
    418418    if ((bkeylen == -1) || (bsaltlen == -1)) 
    419419        return EINVAL; 
    420     return srtp_derive (s, bkey, bkeylen, bsalt, bsaltlen) ? EINVAL : 0; 
     420    return srtp_setkey (s, bkey, bkeylen, bsalt, bsaltlen) ? EINVAL : 0; 
    421421} 
    422422