From 43bdba2b2c55f1e61ece053ff21a59f315680932 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Wed, 4 Jul 2018 13:11:08 +0100
Subject: [PATCH] Switch to mbedtls for bmx7
---
src/freedombone-image-customise | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/freedombone-image-customise b/src/freedombone-image-customise
index f24268530..994ff82c6 100755
--- a/src/freedombone-image-customise
+++ b/src/freedombone-image-customise
@@ -137,7 +137,7 @@ BMX6_REPO="https://github.com/bmx-routing/bmx6"
BMX6_COMMIT='39dd1f2d99ac5a3fa28e92f8173c15039132e181'
BMX7_REPO="https://github.com/bmx-routing/bmx7"
-BMX7_COMMIT='66c853f529662873d1420d39461c75be6eb88b45'
+BMX7_COMMIT='85841b068ff4db82b038decbd3c5191edd56d826'
CONTINUOUS_INTEGRATION=
@@ -833,18 +833,20 @@ install_bmx7() {
git clone "$BMX7_REPO" "$rootdir/etc/bmx7"
+ MBEDTLS_VERSION='2.11.0'
+
cat <<EOF > "$rootdir/usr/bin/install_bmx7"
#!/bin/bash
cd /etc
-wget https://polarssl.org/code/releases/polarssl-1.3.3-gpl.tgz
-tar xzvf polarssl-1.3.3-gpl.tgz
-cd /etc/polarssl-1.3.3
+wget https://tls.mbed.org/download/mbedtls-${MBEDTLS_VERSION}-gpl.tgz
+tar xzvf mbedtls-${MBEDTLS_VERSION}-gpl.tgz
+cd mbedtls-${MBEDTLS_VERSION}
make
sudo make install
cd /etc/bmx7
git checkout $BMX7_COMMIT -b $BMX7_COMMIT
-make EXTRA_CFLAGS="-DCRYPTLIB=POLARSSL_1_3_3"
+make EXTRA_CFLAGS="-DCRYPTLIB=MBEDTLS_${MBEDTLS_VERSION}"
make install
cd /etc/bmx7/lib/bmx7_http_info
--
GitLab