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

srtp/crypto/include/crypto_types.h

 /*
  * crypto_types.h
  *
  * constants for cipher types and auth func types
  *
  * 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 112 matching lines @@
  */
 #define AES_128_CBC        AES_CBC            
 
 /**
  * @brief Strongest available cipher.
  *
  * This identifier resolves to the strongest cipher type available.
  */
 #define STRONGHOLD_CIPHER  AES_ICM  
 
+/** 
+ * @brief AES-192 Integer Counter Mode (AES ICM)             
+ * AES-192 ICM is a deprecated alternate name for AES ICM.
+ */
+#define AES_192_ICM        4 
+
+/** 
+ * @brief AES-256 Integer Counter Mode (AES ICM)             
+ * AES-256 ICM is a deprecated alternate name for AES ICM.
+ */
+#define AES_256_ICM        5 
+
+/** 
+ * @brief AES-128_GCM Galois Counter Mode (AES GCM)             
+ *
+ * AES-128 GCM is the variant of galois counter mode that is used by 
+ * Secure RTP.  This cipher uses a 16-octet key.
+ */
+#define AES_128_GCM        6            
+
+/** 
+ * @brief AES-256_GCM Galois Counter Mode (AES GCM)             
+ *
+ * AES-256 GCM is the variant of galois counter mode that is used by 
+ * Secure RTP.  This cipher uses a 32-octet key.
+ */
+#define AES_256_GCM        7            
+
 /**
  * @}
  */
 
 
 
 /**
  * @defgroup Authentication Authentication Function Types
  * 
  * @brief Each authentication function type is identified by an
@@ skipping 57 matching lines @@
 #define STRONGHOLD_AUTH    HMAC_SHA1   
 
 /**
  * @}
  */
 /**
  * @}
  */
 
 #endif  /* CRYPTO_TYPES_H */