Land https://codereview.chromium.org/889083003/ to update libsrtp to upstream 1.5.0

srtp/crypto/include/aes_icm.h

Index: srtp/crypto/include/aes_icm.h
===================================================================
--- srtp/crypto/include/aes_icm.h	(revision 294174)
+++ srtp/crypto/include/aes_icm.h	(working copy)
@@ -7,6 +7,7 @@
  * Cisco Systems, Inc.
  *
  */
+
 /*
  *	
  * Copyright (c) 2001-2006, Cisco Systems, Inc.
@@ -64,7 +65,7 @@
 		     int key_len); 
 
 err_status_t
-aes_icm_set_iv(aes_icm_ctx_t *c, void *iv);
+aes_icm_set_iv(aes_icm_ctx_t *c, void *iv, int direction);
 
 err_status_t
 aes_icm_encrypt(aes_icm_ctx_t *c,
@@ -72,7 +73,7 @@
 
 err_status_t
 aes_icm_output(aes_icm_ctx_t *c,
-	       unsigned char *buf, int bytes_to_output);
+	       unsigned char *buf, unsigned int bytes_to_output);
 
 err_status_t 
 aes_icm_dealloc(cipher_t *c);
@@ -88,5 +89,8 @@
 		       int key_len, 
 		       int forIsmacryp);
 
+uint16_t
+aes_icm_bytes_encrypted(aes_icm_ctx_t *c);
+
 #endif /* AES_ICM_H */