Update libsrtp to upstream 1.5.0

srtp/crypto/rng/rand_source_ossl.c

Index: srtp/crypto/rng/rand_source_ossl.c
diff --git a/srtp/crypto/include/alloc.h b/srtp/crypto/rng/rand_source_ossl.c
similarity index 71%
copy from srtp/crypto/include/alloc.h
copy to srtp/crypto/rng/rand_source_ossl.c
index 5980eed6c13c6be2c43be308cc3e9d8a81676386..4bca6ac8fec7fbb37389a102d8b9039529d79148 100644
--- a/srtp/crypto/include/alloc.h
+++ b/srtp/crypto/rng/rand_source_ossl.c
@@ -1,32 +1,32 @@
 /*
- * alloc.h
+ * rand_source_ossl.c
  *
- * interface to memory allocation and deallocation, with optional debugging 
+ * implements a random source based on OpenSSL RAND_bytes()
  *
- * 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
  * modification, are permitted provided that the following conditions
- * are met:
- * 
+ * are met:crypto/test/aes_calc.c
+ *
  *   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
  *   copyright notice, this list of conditions and the following
  *   disclaimer in the documentation and/or other materials provided
  *   with the distribution.
- * 
+ *
  *   Neither the name of the Cisco Systems, Inc. nor the names of its
  *   contributors may be used to endorse or promote products derived
  *   from this software without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
@@ -42,16 +42,29 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+    #include <config.h>
+#endif
 
-#ifndef CRYPTO_ALLOC_H
-#define CRYPTO_ALLOC_H
+#include "rand_source.h"
+#include <openssl/rand.h>
 
-#include "datatypes.h"
 
-void *
-crypto_alloc(size_t size);
+err_status_t rand_source_init (void)
+{
+    return err_status_ok;
+}
 
-void
-crypto_free(void *ptr);
+err_status_t rand_source_get_octet_string (void *dest, uint32_t len)
+{
+    if (RAND_bytes(dest, len) == 1) {
+        return err_status_ok;
+    } else {
+        return err_status_fail;
+    }
+}
 
-#endif /* CRYPTO_ALLOC_H */
+err_status_t rand_source_deinit (void)
+{
+    return err_status_ok;
+}