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

srtp/crypto/include/prng.h

 /*
  * prng.h
  *
  * pseudorandom source
  *
  * David A. McGrew
  * Cisco Systems, Inc.
  */
+
 /*
  *      
  * Copyright (c) 2001-2006, 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
@@ skipping 21 matching lines @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  */
 
 #ifndef PRNG_H
 #define PRNG_H
 
 #include "rand_source.h"  /* for rand_source_func_t definition       */
 #include "aes.h"          /* for aes                                 */
+//FIXME: this is temporary until we pull in the code to use OpenSSL for RNG
+#ifdef OPENSSL
+#include "aes_icm_ossl.h"    /* for aes ctr                             */
+#else
 #include "aes_icm.h"      /* for aes ctr                             */
+#endif
 
 #define MAX_PRNG_OUT_LEN 0xffffffffU
 
 /*
  * x917_prng is an ANSI X9.17-like AES-based PRNG
  */
 
 typedef struct {
   v128_t   state;          /* state data                              */
   aes_expanded_key_t key;  /* secret key                              */
@@ skipping 19 matching lines @@
 } ctr_prng_t;
 
 err_status_t
 ctr_prng_init(rand_source_func_t random_source);
 
 err_status_t
 ctr_prng_get_octet_string(void *dest, uint32_t len);
 
 
 #endif