From 0176694cf5c418134a9eb183e021d03073065474 Mon Sep 17 00:00:00 2001
From: kali <kali@leap.se>
Date: Tue, 13 Oct 2020 20:54:55 +0200
Subject: [pkg] update mbedtls version

---
 Makefile                                     | 8 +-------
 branding/thirdparty/openvpn/build_openvpn.sh | 8 ++++----
 pkg/helper/darwin.go                         | 3 +--
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/Makefile b/Makefile
index 8c4748e..28b03f7 100644
--- a/Makefile
+++ b/Makefile
@@ -63,7 +63,6 @@ dependsLinux:
 	@# debian needs also: snap install snapcraft --classic; snap install  multipass --beta --classic
 
 dependsDarwin:
-	# TODO - bootstrap homebrew if not there
 	@brew install python3 golang make pkg-config curl
 	@brew install --default-names gnu-sed
 
@@ -112,13 +111,8 @@ ifeq (${PLATFORM}, darwin)
 	@cp "${TEMPLATES}/qtinstaller/osx-data/post-install.py" ${INST_DATA}/
 	@cp "${TEMPLATES}/qtinstaller/osx-data/uninstall.py" ${INST_DATA}/
 	@cp "${TEMPLATES}/qtinstaller/osx-data/se.leap.bitmask-helper.plist" ${INST_DATA}/
+	@cp $(OPENVPN_BIN) ${INST_DATA}/openvpn.leap
 	@cp build/bin/${PLATFORM}/bitmask-helper ${INST_DATA}/
-	# FIXME our static openvpn build fails with an "Assertion failed at crypto.c". Needs to be fixed!!! - kali
-	# a working (old) version:
-	#@curl -L https://downloads.leap.se/thirdparty/osx/openvpn/openvpn -o build/${PROVIDER}/staging/openvpn-osx
-	#FIXME FIXME @cp $(OPENVPN_BIN) ${INST_DATA}/openvpn.leap
-	@rm -f ${INST_DATA}openvpn.leap && cp /usr/local/bin/openvpn ${INST_DATA}/openvpn.leap
-	@echo "WARNING: workaround for broken static build. Shipping homebrew dynamically linked instead"
 	@echo "[+] Running macdeployqt"
 	@macdeployqt ${QTBUILD}/release/${PROVIDER}-vpn.app ${MACDEPLOYQT_OPTS}
 	@cp -r "${QTBUILD}/release/${TARGET}.app"/ ${INST_DATA}/
diff --git a/branding/thirdparty/openvpn/build_openvpn.sh b/branding/thirdparty/openvpn/build_openvpn.sh
index 20f764a..dea20d8 100755
--- a/branding/thirdparty/openvpn/build_openvpn.sh
+++ b/branding/thirdparty/openvpn/build_openvpn.sh
@@ -11,10 +11,10 @@ set -e
 
 # [!] This needs to be updated for every release --------------------------
 OPENVPN="openvpn-2.4.9"
-MBEDTLS="mbedtls-2.23.0"
+MBEDTLS="mbedtls-2.24.0"
 LZO="lzo-2.10"
 ZLIB="zlib-1.2.11"
-MBEDTLS_SHA512="c2a04f659bf63522f10f6660c2d196d7f39a057ff5a382734ba3b839f463ead4e5c9bc0d21fb909d56fcd2ee4c711248be14861f388cd383385484d364247634"
+MBEDTLS_SHA512="5437ea57eb8b8af9446a796876aa2bfe3c59c88f926b1638c7e8a021a8bef9f4bc6cb1b254e7387e2afe095bd27c518060719726bbaf5478582a56c34315cfb8"
 LZO_SHA1="4924676a9bae5db58ef129dc1cebce3baa3c4b5d"
 # -------------------------------------------------------------------------
 
@@ -88,9 +88,9 @@ function build_mbedtls()
 	sha512=`${SHASUM} -a 512 -p ${MBEDTLS}.tar.gz | cut -d' ' -f 1`
 	
 	if [ "${MBEDTLS_SHA512}" = "${sha512}" ]; then
-	    echo "[+] sha1 verified ok"
+	    echo "[+] sha-512 verified ok"
 	else
-	    echo "[!] problem with sha1 verification"
+	    echo "[!] problem with sha-512 verification"
 	    exit 1
 	fi
 	tar zxvf $MBEDTLS.tar.gz
diff --git a/pkg/helper/darwin.go b/pkg/helper/darwin.go
index 2210da3..7269981 100644
--- a/pkg/helper/darwin.go
+++ b/pkg/helper/darwin.go
@@ -57,7 +57,6 @@ func _getExecPath() string {
 
 func getHelperDir() string {
 	d := _getExecPath()
-	log.Println(">>> DEBUG: helper dir", d)
 	return d
 }
 
@@ -107,7 +106,7 @@ func runServer(preferredPort int) {
 
 func getOpenvpnPath() string {
 	openvpnPath := filepath.Join(getHelperDir(), "openvpn.leap")
-	log.Println(">>> DEBUG: openvpn", openvpnPath)
+	log.Println("openvpn path:", openvpnPath)
 	return openvpnPath
 }
 
-- 
cgit v1.2.3