298977887/lede
1
0
Fork 0
mirror of https://github.com/coolsnowwolf/lede.git synced 2025-04-16 04:13:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/coolsnowwolf/lede

Browse Source
This commit is contained in:
lean 2023-09-17 04:11:21 +08:00
commit f56df16317
4 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/libs/mbedtls/Makefile
View File

@ -8,13 +8,13 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=mbedtls PKG_NAME:=mbedtls
PKG_VERSION:=2.28.3 PKG_VERSION:=2.28.4
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_USE_MIPS16:=0 PKG_USE_MIPS16:=0
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/ARMmbed/mbedtls/tar.gz/v$(PKG_VERSION)? 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:=GPL-2.0-or-later
PKG_LICENSE_FILES:=gpl-2.0.txt PKG_LICENSE_FILES:=gpl-2.0.txt

6
package/libs/mbedtls/patches/100-x509-crt-verify-SAN-iPAddress.patch
View File

@ -33,7 +33,7 @@ Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
#include <windows.h> #include <windows.h>
#else #else
#include <time.h> #include <time.h>
@@ -2995,6 +2999,61 @@ find_parent: @@ -3001,6 +3005,61 @@ find_parent:
} }
} }
@ -95,7 +95,7 @@ Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
/* /*
* Check for CN match * 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; return -1;
} }
@ -158,7 +158,7 @@ Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
} }
/* /*
@@ -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) uint32_t *flags)
{ {
const mbedtls_x509_name *name; const mbedtls_x509_name *name;

6
target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-cm520-79f.dts
View File

@ -16,6 +16,10 @@
led-upgrade = &led_sys; led-upgrade = &led_sys;
}; };
chosen {
bootargs-append = " ubi.block=0,1 root=/dev/ubiblock0_1";
};
soc { soc {
rng@22000 { rng@22000 {
status = "okay"; status = "okay";
@ -306,7 +310,7 @@
}; };
partition@b80000 { partition@b80000 {
label = "ubi"; label = "rootfs";
reg = <0xb80000 0x7480000>; reg = <0xb80000 0x7480000>;
}; };
}; };

10
target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-r619ac.dtsi
View File

@ -7,10 +7,6 @@
#include <dt-bindings/leds/common.h> #include <dt-bindings/leds/common.h>
/ { / {
chosen {
bootargs-append = " ubi.mtd=ubi root=/dev/ubiblock0_1";
};
aliases { aliases {
led-boot = &led_sys; led-boot = &led_sys;
led-failsafe = &led_sys; led-failsafe = &led_sys;
@ -19,6 +15,10 @@
label-mac-device = &gmac0; label-mac-device = &gmac0;
}; };
chosen {
bootargs-append = " root=/dev/ubiblock0_1";
};
soc { soc {
rng@22000 { rng@22000 {
status = "okay"; status = "okay";
@ -212,7 +212,7 @@
#size-cells = <1>; #size-cells = <1>;
nand_rootfs: partition@0 { nand_rootfs: partition@0 {
label = "ubi"; label = "rootfs";
/* reg defined in 64M/128M variant dts. */ /* reg defined in 64M/128M variant dts. */
}; };
}; };