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

srtp/crypto/include/aes_cbc.h

Index: srtp/crypto/include/aes_cbc.h
===================================================================
--- srtp/crypto/include/aes_cbc.h	(revision 294174)
+++ srtp/crypto/include/aes_cbc.h	(working copy)
@@ -7,6 +7,7 @@
  * Cisco Systems, Inc.
  *
  */
+
 /*
  *	
  * Copyright (c) 2001-2006, Cisco Systems, Inc.
@@ -52,6 +53,8 @@
 typedef struct {
   v128_t   state;                  /* cipher chaining state            */
   v128_t   previous;               /* previous ciphertext block        */
+  uint8_t  key[32];
+  int      key_len;
   aes_expanded_key_t expanded_key; /* the cipher key                   */
 } aes_cbc_ctx_t;
 
@@ -66,10 +69,10 @@
 
 err_status_t
 aes_cbc_context_init(aes_cbc_ctx_t *c, const uint8_t *key, 
-		     int key_len, cipher_direction_t dir);
+		     int key_len);
 
 err_status_t
-aes_cbc_set_iv(aes_cbc_ctx_t *c, void *iv);
+aes_cbc_set_iv(aes_cbc_ctx_t *c, void *iv, int direction);
 
 err_status_t
 aes_cbc_nist_encrypt(aes_cbc_ctx_t *c,