From ab9b700bbbb5a5aa56575e6914735e7c062e3882 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Thu, 4 Feb 2016 12:02:19 +0100
Subject: [PATCH 1/3] Started using bctoolbox

---
 .gitmodules                  | 6 ++++++
 Makefile                     | 1 +
 jni/Android.mk               | 7 +++++++
 jni/Application.mk           | 5 +++++
 submodules/bctoolbox         | 1 +
 submodules/belle-sip         | 2 +-
 submodules/externals/mbedtls | 1 +
 7 files changed, 22 insertions(+), 1 deletion(-)
 create mode 160000 submodules/bctoolbox
 create mode 160000 submodules/externals/mbedtls

diff --git a/.gitmodules b/.gitmodules
index 53d5b7712..d5deb56bd 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -91,3 +91,9 @@
 [submodule "submodules/mscodec2"]
 	path = submodules/mscodec2
 	url = git://git.linphone.org/mscodec2.git
+[submodule "submodules/bctoolbox"]
+	path = submodules/bctoolbox
+	url = git://git.linphone.org/bctoolbox.git
+[submodule "submodules/externals/mbedtls"]
+	path = submodules/externals/mbedtls
+	url = https://github.com/ARMmbed/mbedtls.git
diff --git a/Makefile b/Makefile
index 142822082..06d8e9084 100644
--- a/Makefile
+++ b/Makefile
@@ -61,6 +61,7 @@ BUILD_RTP_MAP=0
 BUILD_DONT_CHECK_HEADERS_IN_MESSAGE=0
 BUILD_ILBC=1
 BUILD_CODEC2=0
+BUILD_BCTOOLBOX_MBEDTLS=0
 LIBLINPHONE_EXTENDED_SRC_FILES=
 LIBLINPHONE_EXTENDED_C_INCLUDES=
 LIBLINPHONE_EXTENDED_CFLAGS=
diff --git a/jni/Android.mk b/jni/Android.mk
index 30cf57f03..2fb28ef27 100755
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -57,7 +57,14 @@ ifeq ($(BUILD_MATROSKA), 1)
 include $(linphone-root-dir)/submodules/externals/build/libmatroska-c/Android.mk
 endif
 
+ifeq ($(BUILD_BCTOOLBOX_MBEDTLS),1)
+include $(linphone-root-dir)/submodules/externals/build/mbedtls/Android.mk
+include $(linphone-root-dir)/submodules/bctoolbox/build/android/Android-mbedtls.mk
+else
 include $(linphone-root-dir)/submodules/externals/build/polarssl/Android.mk
+include $(linphone-root-dir)/submodules/bctoolbox/build/android/Android-polarssl.mk
+endif
+
 ifeq ($(BUILD_MEDIASTREAMER2_SDK), 0)
 include $(linphone-root-dir)/submodules/externals/build/antlr3/Android.mk
 include $(linphone-root-dir)/submodules/belle-sip/build/android/Android.mk
diff --git a/jni/Application.mk b/jni/Application.mk
index ab32cd6d1..ff8d1493e 100644
--- a/jni/Application.mk
+++ b/jni/Application.mk
@@ -55,10 +55,15 @@ ifeq ($(BUILD_UPNP),1)
 APP_MODULES += libupnp
 endif
 
+APP_MODULES +=bctoolbox
 ifeq ($(BUILD_TLS),1)
+ifeq ($(BUILD_BCTOOLBOX_MBEDTLS),1)
+APP_MODULES +=mbedtls
+else
 APP_MODULES +=polarssl
 endif
 endif
+endif
 
 ifeq ($(BUILD_VIDEO),1)
 APP_MODULES += libffmpeg-linphone
diff --git a/submodules/bctoolbox b/submodules/bctoolbox
new file mode 160000
index 000000000..f0080ffcb
--- /dev/null
+++ b/submodules/bctoolbox
@@ -0,0 +1 @@
+Subproject commit f0080ffcb26883b664bc785abff15a6698dee0c3
diff --git a/submodules/belle-sip b/submodules/belle-sip
index 77d350a94..43b9e1814 160000
--- a/submodules/belle-sip
+++ b/submodules/belle-sip
@@ -1 +1 @@
-Subproject commit 77d350a949ad073de0718ab60b86c74930517f1b
+Subproject commit 43b9e1814e91b0c298ebe6590d37fc2ba81acd91
diff --git a/submodules/externals/mbedtls b/submodules/externals/mbedtls
new file mode 160000
index 000000000..bfafadb45
--- /dev/null
+++ b/submodules/externals/mbedtls
@@ -0,0 +1 @@
+Subproject commit bfafadb45daf8d2114e3109e2f9021fc72ee36bb

From b639a6b9fc7b8924b583a3b8577ccd2ea47a8c60 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Thu, 4 Feb 2016 15:41:02 +0100
Subject: [PATCH 2/3] Updated bzrtp to use mbedtls instead of polarssl

---
 submodules/bzrtp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/submodules/bzrtp b/submodules/bzrtp
index 253e1543f..d1cf1db91 160000
--- a/submodules/bzrtp
+++ b/submodules/bzrtp
@@ -1 +1 @@
-Subproject commit 253e1543f13576be66fb4ed5396c0b99eeb08fb4
+Subproject commit d1cf1db915cf38001c1bd79bceb0e9c92ce170d3

From d902d522322937ab64498e4e4aae420dd4875e26 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Fri, 5 Feb 2016 10:09:47 +0100
Subject: [PATCH 3/3] Updated linphone

---
 submodules/linphone | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/submodules/linphone b/submodules/linphone
index 933748ee9..b504646e5 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 933748ee9becf3186776f9d1cb69a00e92dc2905
+Subproject commit b504646e58eb47a295ac58bce2870327dca00468