Update libsrtp to upstream 1.5.0

srtp/crypto/cipher/null_cipher.c

 /*
  * null_cipher.c
  *
  * A null cipher implementation.  This cipher leaves the plaintext
  * unchanged.
  *
  * David A. McGrew
  * Cisco Systems, Inc.
  */
 
 /*
  *      
- * Copyright (c) 2001-2006, Cisco Systems, Inc.
+ * Copyright (c) 2001-2006,2013 Cisco Systems, Inc.
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 
  *   Redistributions of source code must retain the above copyright
  *   notice, this list of conditions and the following disclaimer.
  * 
  *   Redistributions in binary form must reproduce the above
@@ skipping 13 matching lines @@
  * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
  * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  */
 
+#ifdef HAVE_CONFIG_H
+    #include <config.h>
+#endif
+
 #include "datatypes.h"
 #include "null_cipher.h"
 #include "alloc.h"
 
 /* the null_cipher uses the cipher debug module  */
 
 extern debug_module_t mod_cipher;
 
 err_status_t
-null_cipher_alloc(cipher_t **c, int key_len) {
+null_cipher_alloc(cipher_t **c, int key_len, int tlen) {
   extern cipher_type_t null_cipher;
   uint8_t *pointer;
   
   debug_print(mod_cipher, 
               "allocating cipher with key length %d", key_len);
 
   /* allocate memory a cipher of type null_cipher */
   pointer = (uint8_t*)crypto_alloc(sizeof(null_cipher_ctx_t) + sizeof(cipher_t));
   if (pointer == NULL)
     return err_status_alloc_fail;
 
   /* set pointers */
   *c = (cipher_t *)pointer;
+  (*c)->algorithm = NULL_CIPHER;
   (*c)->type = &null_cipher;
   (*c)->state = pointer + sizeof(cipher_t);
 
   /* set key size */
   (*c)->key_len = key_len;
 
   /* increment ref_count */
   null_cipher.ref_count++;
   
   return err_status_ok;
@@ skipping 42 matching lines @@
 
 cipher_test_case_t  
 null_cipher_test_0 = {
   0,                 /* octets in key            */
   NULL,              /* key                      */
   0,                 /* packet index             */
   0,                 /* octets in plaintext      */
   NULL,              /* plaintext                */
   0,                 /* octets in plaintext      */
   NULL,              /* ciphertext               */
+  0,
+  NULL,
+  0,
   NULL               /* pointer to next testcase */
 };
 
 
 /*
  * note: the decrypt function is idential to the encrypt function
  */
 
 cipher_type_t null_cipher = {
   (cipher_alloc_func_t)         null_cipher_alloc,
   (cipher_dealloc_func_t)       null_cipher_dealloc,
   (cipher_init_func_t)          null_cipher_init,
+  (cipher_set_aad_func_t)       0,
   (cipher_encrypt_func_t)       null_cipher_encrypt,
   (cipher_decrypt_func_t)       null_cipher_encrypt,
   (cipher_set_iv_func_t)        null_cipher_set_iv,
+  (cipher_get_tag_func_t)       0,
   (char *)                      null_cipher_description,
   (int)                         0,
   (cipher_test_case_t *)       &null_cipher_test_0,
   (debug_module_t *)            NULL,
   (cipher_type_id_t)            NULL_CIPHER
 };