diff options
Diffstat (limited to 'third_party')
-rw-r--r-- | third_party/build/os-auto.mak.in | 16 | ||||
-rw-r--r-- | third_party/build/srtp/Makefile | 11 |
2 files changed, 21 insertions, 6 deletions
diff --git a/third_party/build/os-auto.mak.in b/third_party/build/os-auto.mak.in index ef261f65..66653fa1 100644 --- a/third_party/build/os-auto.mak.in +++ b/third_party/build/os-auto.mak.in @@ -35,6 +35,22 @@ ifeq (@ac_external_srtp@,1) # External SRTP else DIRS += srtp + +ifeq (@ac_ssl_has_aes_gcm@,0) +CIPHERS_SRC = crypto/cipher/aes.o crypto/cipher/aes_icm.o \ + crypto/cipher/aes_cbc.o +HASHES_SRC = crypto/hash/sha1.o crypto/hash/hmac.o \ + # crypto/hash/tmmhv2.o +RNG_SRC = crypto/rng/rand_source.o crypto/rng/prng.o \ + crypto/rng/ctr_prng.o +else +CIPHERS_SRC = crypto/cipher/aes_icm_ossl.o crypto/cipher/aes_gcm_ossl.o +HASHES_SRC = crypto/hash/hmac_ossl.o +RNG_SRC = crypto/rng/rand_source_ossl.o +SRTP_OTHER_CFLAGS = -DOPENSSL +endif + + endif ifeq (@ac_pjmedia_resample@,libresample) diff --git a/third_party/build/srtp/Makefile b/third_party/build/srtp/Makefile index 7ef0f259..58d4fc58 100644 --- a/third_party/build/srtp/Makefile +++ b/third_party/build/srtp/Makefile @@ -1,5 +1,6 @@ include ../../../build.mak include ../../../build/common.mak +include ../os-$(OS_NAME).mak export LIBDIR := ../../lib @@ -28,11 +29,9 @@ export _LDFLAGS := $(CC_LDFLAGS) $(OS_LDFLAGS) $(M_LDFLAGS) $(HOST_LDFLAGS) \ # libcrypt.a (the crypto engine) ciphers = crypto/cipher/cipher.o crypto/cipher/null_cipher.o \ - crypto/cipher/aes.o crypto/cipher/aes_icm.o \ - crypto/cipher/aes_cbc.o + $(CIPHERS_SRC) -hashes = crypto/hash/null_auth.o crypto/hash/sha1.o \ - crypto/hash/hmac.o crypto/hash/auth.o # crypto/hash/tmmhv2.o +hashes = crypto/hash/null_auth.o crypto/hash/auth.o $(HASHES_SRC) replay = crypto/replay/rdb.o crypto/replay/rdbx.o \ crypto/replay/ut_sim.o @@ -41,7 +40,7 @@ math = crypto/math/datatypes.o crypto/math/stat.o ust = crypto/ust/ust.o -rng = crypto/rng/rand_source.o crypto/rng/prng.o crypto/rng/ctr_prng.o +rng = $(RNG_SRC) err = pjlib/srtp_err.o @@ -54,7 +53,7 @@ cryptobj = $(ciphers) $(hashes) $(math) $(stat) $(kernel) $(replay) export SRTP_SRCDIR = ../../srtp export SRTP_OBJS = $(cryptobj) $(srtpobj) -export SRTP_CFLAGS = -DHAVE_CONFIG_H $(_CFLAGS) +export SRTP_CFLAGS = -DHAVE_CONFIG_H $(_CFLAGS) $(SRTP_OTHER_CFLAGS) export SRTP_LDFLAGS = $(PJLIB_LDLIB) $(_LDFLAGS) |