Update libsrtp to upstream 1.5.0

srtp/crypto/cipher/null_cipher.c

Index: srtp/crypto/cipher/null_cipher.c
diff --git a/srtp/crypto/cipher/null_cipher.c b/srtp/crypto/cipher/null_cipher.c
index 724f4df3a897ac89f463421e523e78a0749fa16b..3cd49fb9682521e701ff321629ebeb05d3f8cbe6 100644
--- a/srtp/crypto/cipher/null_cipher.c
+++ b/srtp/crypto/cipher/null_cipher.c
@@ -10,7 +10,7 @@
 
 /*
  *	
- * 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
@@ -44,6 +44,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+    #include <config.h>
+#endif
+
 #include "datatypes.h"
 #include "null_cipher.h"
 #include "alloc.h"
@@ -53,7 +57,7 @@
 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;
   
@@ -67,6 +71,7 @@ null_cipher_alloc(cipher_t **c, int key_len) {
 
   /* set pointers */
   *c = (cipher_t *)pointer;
+  (*c)->algorithm = NULL_CIPHER;
   (*c)->type = &null_cipher;
   (*c)->state = pointer + sizeof(cipher_t);
 
@@ -129,6 +134,9 @@ null_cipher_test_0 = {
   NULL,              /* plaintext                */
   0,                 /* octets in plaintext      */
   NULL,              /* ciphertext               */
+  0,
+  NULL,
+  0,
   NULL               /* pointer to next testcase */
 };
 
@@ -141,9 +149,11 @@ 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,