Update libsrtp to upstream 1.5.0

srtp/crypto/include/aes_gcm_ossl.h

Index: srtp/crypto/include/aes_gcm_ossl.h
diff --git a/srtp/crypto/include/alloc.h b/srtp/crypto/include/aes_gcm_ossl.h
similarity index 79%
copy from srtp/crypto/include/alloc.h
copy to srtp/crypto/include/aes_gcm_ossl.h
index 5980eed6c13c6be2c43be308cc3e9d8a81676386..8e7711dc526c13fffa1b5b9382f1720c15d7436d 100644
--- a/srtp/crypto/include/alloc.h
+++ b/srtp/crypto/include/aes_gcm_ossl.h
@@ -1,14 +1,15 @@
 /*
- * alloc.h
+ * aes_gcm_ossl.h
  *
- * interface to memory allocation and deallocation, with optional debugging 
+ * Header for AES Galois Counter Mode.
  *
- * David A. McGrew
+ * John A. Foley
  * Cisco Systems, Inc.
+ *
  */
 /*
  *	
- * Copyright (c) 2001-2006 Cisco Systems, Inc.
+ * Copyright (c) 2013, Cisco Systems, Inc.
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -42,16 +43,21 @@
  *
  */
 
+#ifndef AES_GCM_OSSL_H
+#define AES_GCM_OSSL_H
 
-#ifndef CRYPTO_ALLOC_H
-#define CRYPTO_ALLOC_H
-
-#include "datatypes.h"
+#include "cipher.h"
+#include "srtp.h"
+#include <openssl/evp.h>
+#include <openssl/aes.h>
 
-void *
-crypto_alloc(size_t size);
+typedef struct {
+  v256_t   key;
+  int      key_size;
+  int      tag_len;
+  EVP_CIPHER_CTX ctx;
+  cipher_direction_t dir;
+} aes_gcm_ctx_t;
 
-void
-crypto_free(void *ptr);
+#endif /* AES_GCM_OSSL_H */
 
-#endif /* CRYPTO_ALLOC_H */