From 45107fc44695e12699442a453f92055d33d58c5d Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Thu, 10 Aug 2023 18:03:43 +0200 Subject: [PATCH 1/2] mbedtls: Update to version 2.28.4 This only fixes minor problems. Changelog: https://github.com/Mbed-TLS/mbedtls/releases/tag/v2.28.4 Signed-off-by: Hauke Mehrtens --- package/libs/mbedtls/Makefile | 4 ++-- .../mbedtls/patches/100-x509-crt-verify-SAN-iPAddress.patch | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/libs/mbedtls/Makefile b/package/libs/mbedtls/Makefile index 0052f0956445bf..5121a3d0072481 100644 --- a/package/libs/mbedtls/Makefile +++ b/package/libs/mbedtls/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mbedtls -PKG_VERSION:=2.28.3 +PKG_VERSION:=2.28.4 PKG_RELEASE:=1 PKG_USE_MIPS16:=0 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/ARMmbed/mbedtls/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=bdf7c5bbdc338da3edad89b2885d4f8668f9a6fffeba6ec17a60333e36dade6f +PKG_HASH:=578c4dcd15bbff3f5cd56aa07cd4f850fc733634e3d5947be4f7157d5bfd81ac PKG_LICENSE:=GPL-2.0-or-later PKG_LICENSE_FILES:=gpl-2.0.txt diff --git a/package/libs/mbedtls/patches/100-x509-crt-verify-SAN-iPAddress.patch b/package/libs/mbedtls/patches/100-x509-crt-verify-SAN-iPAddress.patch index c9802eac191f4c..02632cdb4ba1d8 100644 --- a/package/libs/mbedtls/patches/100-x509-crt-verify-SAN-iPAddress.patch +++ b/package/libs/mbedtls/patches/100-x509-crt-verify-SAN-iPAddress.patch @@ -33,7 +33,7 @@ Signed-off-by: Glenn Strauss #include #else #include -@@ -2995,6 +2999,61 @@ find_parent: +@@ -3001,6 +3005,61 @@ find_parent: } } @@ -95,7 +95,7 @@ Signed-off-by: Glenn Strauss /* * Check for CN match */ -@@ -3015,24 +3074,51 @@ static int x509_crt_check_cn(const mbedt +@@ -3021,24 +3080,51 @@ static int x509_crt_check_cn(const mbedt return -1; } @@ -158,7 +158,7 @@ Signed-off-by: Glenn Strauss } /* -@@ -3043,31 +3129,23 @@ static void x509_crt_verify_name(const m +@@ -3049,31 +3135,23 @@ static void x509_crt_verify_name(const m uint32_t *flags) { const mbedtls_x509_name *name; From ad98915e765b04bc58abbf4ed3a1e4410adc642d Mon Sep 17 00:00:00 2001 From: aiamadeus <2789289348@qq.com> Date: Thu, 13 Jul 2023 23:19:21 +0800 Subject: [PATCH 2/2] ipq40xx: try to fixes booting issue No testing since there is no board. --- .../files/arch/arm/boot/dts/qcom-ipq4019-cm520-79f.dts | 6 +++++- .../files/arch/arm/boot/dts/qcom-ipq4019-r619ac.dtsi | 10 +++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-cm520-79f.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-cm520-79f.dts index ba6aabdc9c1dc2..4c79ecb101853f 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-cm520-79f.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-cm520-79f.dts @@ -16,6 +16,10 @@ led-upgrade = &led_sys; }; + chosen { + bootargs-append = " ubi.block=0,1 root=/dev/ubiblock0_1"; + }; + soc { rng@22000 { status = "okay"; @@ -306,7 +310,7 @@ }; partition@b80000 { - label = "ubi"; + label = "rootfs"; reg = <0xb80000 0x7480000>; }; }; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-r619ac.dtsi b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-r619ac.dtsi index 87e0d103b71b53..43f655c1e815d4 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-r619ac.dtsi +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-r619ac.dtsi @@ -7,10 +7,6 @@ #include / { - chosen { - bootargs-append = " ubi.mtd=ubi root=/dev/ubiblock0_1"; - }; - aliases { led-boot = &led_sys; led-failsafe = &led_sys; @@ -19,6 +15,10 @@ label-mac-device = &gmac0; }; + chosen { + bootargs-append = " root=/dev/ubiblock0_1"; + }; + soc { rng@22000 { status = "okay"; @@ -212,7 +212,7 @@ #size-cells = <1>; nand_rootfs: partition@0 { - label = "ubi"; + label = "rootfs"; /* reg defined in 64M/128M variant dts. */ }; };