Use zrtp version 4.0.0
- update zrtp submodule to point to Werner Dittman github repo - remove openssl from compile - update libsrtp module to get the one fixing the name collision with zrtp internal function
This commit is contained in:
Johan Pascal
parent
f4d0c9cff7
commit
eb3db0cbd5
7 changed files with 12 additions and 65 deletions
2
.gitmodules
vendored
2
.gitmodules
vendored
|
|
@ -36,7 +36,7 @@
|
||||||
url = http://git.chromium.org/webm/libvpx.git
|
url = http://git.chromium.org/webm/libvpx.git
|
||||||
[submodule "submodules/externals/libzrtpcpp"]
|
[submodule "submodules/externals/libzrtpcpp"]
|
||||||
path = submodules/externals/libzrtpcpp
|
path = submodules/externals/libzrtpcpp
|
||||||
url = git://git.linphone.org/zrtpcpp.git
|
url = https://github.com/wernerd/ZRTPCPP.git
|
||||||
[submodule "submodules/externals/srtp"]
|
[submodule "submodules/externals/srtp"]
|
||||||
path = submodules/externals/srtp
|
path = submodules/externals/srtp
|
||||||
url = git://git.linphone.org/srtp.git
|
url = git://git.linphone.org/srtp.git
|
||||||
|
|
|
||||||
14
Makefile
14
Makefile
|
|
@ -219,15 +219,15 @@ endif
|
||||||
|
|
||||||
|
|
||||||
#Zrtp
|
#Zrtp
|
||||||
$(TOPDIR)/submodules/externals/libzrtpcpp/libzrtpcpp-config.h : $(TOPDIR)/submodules/externals/build/libzrtpcpp/libzrtpcpp-config.h
|
#$(TOPDIR)/submodules/externals/libzrtpcpp/libzrtpcpp-config.h : $(TOPDIR)/submodules/externals/build/libzrtpcpp/libzrtpcpp-config.h
|
||||||
@cd $(TOPDIR)/submodules/externals/libzrtpcpp/ && \
|
# @cd $(TOPDIR)/submodules/externals/libzrtpcpp/ && \
|
||||||
cp ../build/libzrtpcpp/libzrtpcpp-config.h . \
|
# cp ../build/libzrtpcpp/libzrtpcpp-config.h . \
|
||||||
|| ( echo "ZRTP prepare state failed." ; exit 1 )
|
|| ( echo "ZRTP prepare state failed." ; exit 1 )
|
||||||
ifeq ($(BUILD_GPLV3_ZRTP), 1)
|
#ifeq ($(BUILD_GPLV3_ZRTP), 1)
|
||||||
prepare-zrtp: $(TOPDIR)/submodules/externals/libzrtpcpp/libzrtpcpp-config.h
|
#prepare-zrtp: $(TOPDIR)/submodules/externals/libzrtpcpp/libzrtpcpp-config.h
|
||||||
else
|
#else
|
||||||
prepare-zrtp:
|
prepare-zrtp:
|
||||||
endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -20,7 +20,8 @@ endif
|
||||||
ifeq ($(BUILD_GPLV3_ZRTP), 1)
|
ifeq ($(BUILD_GPLV3_ZRTP), 1)
|
||||||
BUILD_SRTP=1
|
BUILD_SRTP=1
|
||||||
ZRTP_C_INCLUDE= \
|
ZRTP_C_INCLUDE= \
|
||||||
$(linphone-root-dir)/submodules/externals/libzrtpcpp/src
|
$(linphone-root-dir)/submodules/externals/libzrtpcpp/zrtp \
|
||||||
|
$(linphone-root-dir)/submodules/externals/libzrtpcpp/zrtp/libzrtpcpp
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(BUILD_SRTP), 1)
|
ifeq ($(BUILD_SRTP), 1)
|
||||||
|
|
|
||||||
|
|
@ -115,7 +115,6 @@ endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(BUILD_GPLV3_ZRTP), 1)
|
ifeq ($(BUILD_GPLV3_ZRTP), 1)
|
||||||
APP_MODULES += libcrypto-linphone libssl-linphone
|
|
||||||
APP_MODULES += libzrtpcpp
|
APP_MODULES += libzrtpcpp
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,53 +0,0 @@
|
||||||
|
|
||||||
/* Define to 1 if you have the <gcrypt.h> header file. */
|
|
||||||
/* #undef HAVE_GCRYPT_H */
|
|
||||||
|
|
||||||
/* Define to 1 if you have the `pthread' library (-lpthread). */
|
|
||||||
/* #undef HAVE_LIBPTHREAD */
|
|
||||||
|
|
||||||
/* Define to 1 if you have the <openssl/aes.h> header file. */
|
|
||||||
#define HAVE_OPENSSL_AES_H 1
|
|
||||||
|
|
||||||
/* Define to 1 if you have the <openssl/bn.h> header file. */
|
|
||||||
#define HAVE_OPENSSL_BN_H 1
|
|
||||||
|
|
||||||
/* Define to 1 if you have the <openssl/sha.h> header file. */
|
|
||||||
#define HAVE_OPENSSL_SHA_H 1
|
|
||||||
|
|
||||||
/* Define to 1 if you have the <pthread.h> header file. */
|
|
||||||
#define HAVE_PTHREAD_H 1
|
|
||||||
|
|
||||||
/* Name of package */
|
|
||||||
#define PACKAGE libzrtpcpp
|
|
||||||
|
|
||||||
/* Version number of package */
|
|
||||||
#define VERSION 2.1.0
|
|
||||||
|
|
||||||
/* Define to empty if `const' does not conform to ANSI C. */
|
|
||||||
#undef const
|
|
||||||
|
|
||||||
/* Define to `__inline__' or `__inline' if that's what the C compiler
|
|
||||||
calls it, or to nothing if 'inline' is not supported under any name. */
|
|
||||||
#ifndef __cplusplus
|
|
||||||
#undef inline
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Define to rpl_malloc if the replacement function should be used. */
|
|
||||||
#undef malloc
|
|
||||||
|
|
||||||
/* Define to the equivalent of the C99 'restrict' keyword, or to
|
|
||||||
nothing if this is not supported. Do not define if restrict is
|
|
||||||
supported directly. */
|
|
||||||
#undef restrict
|
|
||||||
/* Work around a bug in Sun C++: it does not support _Restrict, even
|
|
||||||
though the corresponding Sun C compiler does, which causes
|
|
||||||
"#define restrict _Restrict" in the previous line. Perhaps some future
|
|
||||||
version of Sun C++ will work with _Restrict; if so, it'll probably
|
|
||||||
define __RESTRICT, just as Sun C does. */
|
|
||||||
#if defined __SUNPRO_CC && !defined __RESTRICT
|
|
||||||
# define _Restrict
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Define to empty if the keyword `volatile' does not work. Warning: valid
|
|
||||||
code using `volatile' can become incorrect without. Disable with care. */
|
|
||||||
#undef volatile
|
|
||||||
2
submodules/externals/libzrtpcpp
vendored
2
submodules/externals/libzrtpcpp
vendored
|
|
@ -1 +1 @@
|
||||||
Subproject commit bfbfcab72dfa27862b05607d18bb24b6f8395fcf
|
Subproject commit f07896e38151fa06f5c2527de5470294b2012242
|
||||||
2
submodules/externals/srtp
vendored
2
submodules/externals/srtp
vendored
|
|
@ -1 +1 @@
|
||||||
Subproject commit 14027d37c7574b27bf22e57f508137b4e86b6466
|
Subproject commit d719bf1510a485b6760f76c95b8813bdc60781f6
|
||||||
Loading…
Reference in a new issue