Ignore:
Timestamp:
Mar 15, 2016 3:57:39 AM (8 years ago)
Author:
nanang
Message:

Close #1847: Upgraded libsrtp version to 1.5.4 and added support for AES-CM-256 crypto.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • pjproject/trunk/third_party/srtp/crypto/include/crypto.h

    r1730 r5261  
    66 * David A. McGrew 
    77 * Cisco Systems, Inc. 
     8 */ 
     9 
     10/* 
     11 *       
     12 * Copyright (c) 2001-2006, Cisco Systems, Inc. 
     13 * All rights reserved. 
     14 *  
     15 * Redistribution and use in source and binary forms, with or without 
     16 * modification, are permitted provided that the following conditions 
     17 * are met: 
     18 *  
     19 *   Redistributions of source code must retain the above copyright 
     20 *   notice, this list of conditions and the following disclaimer. 
     21 *  
     22 *   Redistributions in binary form must reproduce the above 
     23 *   copyright notice, this list of conditions and the following 
     24 *   disclaimer in the documentation and/or other materials provided 
     25 *   with the distribution. 
     26 *  
     27 *   Neither the name of the Cisco Systems, Inc. nor the names of its 
     28 *   contributors may be used to endorse or promote products derived 
     29 *   from this software without specific prior written permission. 
     30 *  
     31 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
     32 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
     33 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS 
     34 * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE 
     35 * COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
     36 * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
     37 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 
     38 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 
     39 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, 
     40 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
     41 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED 
     42 * OF THE POSSIBILITY OF SUCH DAMAGE. 
     43 * 
    844 */ 
    945 
Note: See TracChangeset for help on using the changeset viewer.