Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(485)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: srtp/crypto/include/prng.h

Issue 889083003: Update libsrtp to upstream 1.5.0 (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/libsrtp@master
Patch Set: Updated to libsrtp 1.5.1 Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « srtp/crypto/include/kernel_compat.h ('k') | srtp/crypto/include/rdb.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: srtp/crypto/include/prng.h
diff --git a/srtp/crypto/include/prng.h b/srtp/crypto/include/prng.h
index ad0a49c228c7dbb4ed1d054d2df0caacedaa92ea..c5ec2306bc7eb38db9b235dff6882048bf81515f 100644
--- a/srtp/crypto/include/prng.h
+++ b/srtp/crypto/include/prng.h
@@ -6,6 +6,7 @@
* David A. McGrew
* Cisco Systems, Inc.
*/
+
/*
*
* Copyright (c) 2001-2006, Cisco Systems, Inc.
@@ -47,7 +48,12 @@
#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
« no previous file with comments | « srtp/crypto/include/kernel_compat.h ('k') | srtp/crypto/include/rdb.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698