From: Peter Wu <peter@lekensteyn.nl>
Date: Wed, 6 Aug 2014 11:03:53 +0000 (+0200)
Subject: libsrtp: do not include unnecessary sources
X-Git-Tag: v1.4.8~5^2~41
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=98502947c8c94af9a86f03c5956f5779ec8f8346;p=thirdparty%2Ffreeswitch.git

libsrtp: do not include unnecessary sources

These two files should only be built when OpenSSL is not enabled. See
the configure script of the original sources and Makefile from upstream.
(RNG_EXTRA_OBJS)

Fixes a -Wimplicit-function-declaration warning.
---

diff --git a/libs/srtp/Makefile.am b/libs/srtp/Makefile.am
index 598a4e1414..88be99b4e0 100644
--- a/libs/srtp/Makefile.am
+++ b/libs/srtp/Makefile.am
@@ -15,7 +15,6 @@ libsrtp_la_SOURCES =    srtp/srtp.c srtp/ekt.c crypto/cipher/cipher.c crypto/cip
 			crypto/math/datatypes.c crypto/math/stat.c \
 			crypto/kernel/crypto_kernel.c crypto/kernel/alloc.c \
 			crypto/kernel/key.c \
-			crypto/rng/prng.c crypto/rng/ctr_prng.c \
 			crypto/kernel/err.c \
 			crypto/replay/rdb.c crypto/replay/rdbx.c crypto/replay/ut_sim.c 
 
@@ -30,6 +29,7 @@ libsrtp_la_SOURCES += crypto/hash/hmac_ossl.c
 else
 libsrtp_la_SOURCES += crypto/hash/sha1.c crypto/hash/hmac.c 
 libsrtp_la_SOURCES += crypto/cipher/aes_icm.c crypto/cipher/aes.c crypto/cipher/aes_cbc.c
+libsrtp_la_SOURCES += crypto/rng/prng.c crypto/rng/ctr_prng.c
 if RNG_OBJS_LINUX
 libsrtp_la_SOURCES += crypto/rng/rand_linux_kernel.c
 EXTRA_DIST += crypto/rng/rand_source.c