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

srtp/crypto/Makefile.in

Index: srtp/crypto/Makefile.in
===================================================================
--- srtp/crypto/Makefile.in	(revision 294174)
+++ srtp/crypto/Makefile.in	(working copy)
@@ -14,9 +14,9 @@
 CPPFLAGS= @CPPFLAGS@
 CFLAGS	= @CFLAGS@
 LIBS	= @LIBS@
-LDFLAGS	= @LDFLAGS@ -L.
+LDFLAGS	= @LDFLAGS@ -L. -L..
 COMPILE = $(CC) $(DEFS) $(INCDIR) $(CPPFLAGS) $(CFLAGS)
-CRYPTOLIB = -lcryptomodule
+CRYPTOLIB = -lsrtp
 
 RANLIB	= @RANLIB@
 
@@ -25,7 +25,7 @@
 # `make clean` will work on the cygwin platform
 EXE = @EXE@
 # Random source.
-RNG_OBJS = @RNG_OBJS@
+USE_OPENSSL = @USE_OPENSSL@
 
 ifdef ARCH
   DEFS += -D$(ARCH)=1
@@ -40,10 +40,13 @@
 dummy : all runtest 
 
 # test applications 
+ifneq (1, $(USE_OPENSSL))
+AES_CALC = test/aes_calc$(EXE)
+endif
 
 testapp = test/cipher_driver$(EXE) test/datatypes_driver$(EXE) \
 	  test/stat_driver$(EXE) test/sha1_driver$(EXE) \
-	  test/kernel_driver$(EXE) test/aes_calc$(EXE) test/rand_gen$(EXE) \
+	  test/kernel_driver$(EXE) $(AES_CALC) test/rand_gen$(EXE) \
 	  test/env$(EXE)
 
 # data values used to test the aes_calc application for AES-128
@@ -58,11 +61,13 @@
 c256=8ea2b7ca516745bfeafc49904b496089
 
 
-runtest: libcryptomodule.a $(testapp)
+runtest: $(testapp)
 	test/env$(EXE) # print out information on the build environment
-	@echo "running libcryptomodule test applications..."
+	@echo "running crypto test applications..."
+ifneq (1, $(USE_OPENSSL))
 	test `test/aes_calc $(k128) $(p128)` = $(c128)
 	test `test/aes_calc $(k256) $(p256)` = $(c256)
+endif
 	test/cipher_driver$(EXE) -v >/dev/null
 	test/datatypes_driver$(EXE) -v >/dev/null
 	test/stat_driver$(EXE) >/dev/null
@@ -69,50 +74,19 @@
 	test/sha1_driver$(EXE) -v >/dev/null
 	test/kernel_driver$(EXE) -v >/dev/null
 	test/rand_gen$(EXE) -n 256 >/dev/null
-	@echo "libcryptomodule test applications passed."
+	@echo "crypto test applications passed."
 
-# libcryptomodule.a (the crypto engine) 
 
-ciphers = cipher/cipher.o cipher/null_cipher.o      \
-          cipher/aes.o cipher/aes_icm.o             \
-          cipher/aes_cbc.o
-
-hashes  = hash/null_auth.o hash/sha1.o \
-          hash/hmac.o hash/auth.o
-
-math    = math/datatypes.o math/stat.o
-
-rng     = rng/$(RNG_OBJS) rng/rand_source.o rng/prng.o rng/ctr_prng.o
-
-err     = kernel/err.o
-
-kernel  = kernel/crypto_kernel.o  kernel/alloc.o   \
-          kernel/key.o $(rng) $(err)
-
-xfm     = ae_xfm/xfm.o
-
-cryptobj =  $(ciphers) $(hashes) $(math) $(stat) $(kernel) $(xfm)
-
 # the rule for making object files and test apps
 
 %.o: %.c
 	$(COMPILE) -c $< -o $@
 
-%$(EXE): %.c libcryptomodule.a 
+%$(EXE): %.c  
 	$(COMPILE) $(LDFLAGS) $< -o $@ $(CRYPTOLIB) $(LIBS)
 
-ifndef AR
-  AR=ar
-endif
+all: $(testapp)
 
-# and the crypto module library itself
-
-libcryptomodule.a: $(cryptobj) 
-	$(AR) cr libcryptomodule.a $(cryptobj) 
-	$(RANLIB) libcryptomodule.a
-
-all: libcryptomodule.a $(testapp)
-
 # housekeeping functions
 
 clean: