[svn-commits] mjordan: branch 13 r426143 - in /branches/13: ./ res/res_srtp.c

[SVN commits to the Digium repositories]

Author: mjordan
Date: Sun Oct 26 20:47:26 2014
New Revision: 426143

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=426143
Log:
res/res_srtp: Fix include issue for libsrtp 1.5.0

In libsrtp 1.5.0, crypto_get_random is no longer resolved simply by including
srtp.h. Now, one must include crypto_kernel.h as well. As it turns out, this
header file has been provided by the library since 2006, so this is a
relatively benign change.

ASTERISK-24436 #close
Reported by: Patrick Laimbock
........

Merged revisions 426140 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 426141 from http://svn.asterisk.org/svn/asterisk/branches/11
........

Merged revisions 426142 from http://svn.asterisk.org/svn/asterisk/branches/12

Modified:
    branches/13/   (props changed)
    branches/13/res/res_srtp.c

Propchange: branches/13/
------------------------------------------------------------------------------
Binary property 'branch-12-merged' - no diff available.

Modified: branches/13/res/res_srtp.c
URL: http://svnview.digium.com/svn/asterisk/branches/13/res/res_srtp.c?view=diff&rev=426143&r1=426142&r2=426143
==============================================================================
--- branches/13/res/res_srtp.c (original)
+++ branches/13/res/res_srtp.c Sun Oct 26 20:47:26 2014
@@ -40,6 +40,7 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include <srtp/srtp.h>
+#include <srtp/crypto_kernel.h>
 
 #include "asterisk/lock.h"
 #include "asterisk/sched.h"