[OpenWrt-Devel] [PATCH] kernel: Add AEAD and RNG support to kmod-crypto-user
This breaks compatibility with kernel 3.18, but as that is more or less abandoned at this point, it should be fine. Tested on Turris Omnia. Signed-off-by: Rosen Penev --- package/kernel/linux/modules/crypto.mk | 4 1 file changed, 4 insertions(+) diff --git a/package/kernel/linux/modules/crypto.mk b/package/kernel/linux/modules/crypto.mk index 235e6dadac..613059f823 100644 --- a/package/kernel/linux/modules/crypto.mk +++ b/package/kernel/linux/modules/crypto.mk @@ -709,11 +709,15 @@ define KernelPackage/crypto-user DEPENDS:=+kmod-crypto-hash +kmod-crypto-manager KCONFIG:= \ CONFIG_CRYPTO_USER_API \ + CONFIG_CRYPTO_USER_API_AEAD \ CONFIG_CRYPTO_USER_API_HASH \ + CONFIG_CRYPTO_USER_API_RNG \ CONFIG_CRYPTO_USER_API_SKCIPHER FILES:= \ $(LINUX_DIR)/crypto/af_alg.ko \ + $(LINUX_DIR)/crypto/algif_aead.ko \ $(LINUX_DIR)/crypto/algif_hash.ko \ + $(LINUX_DIR)/crypto/algif_rng.ko \ $(LINUX_DIR)/crypto/algif_skcipher.ko AUTOLOAD:=$(call AutoLoad,09,af_alg algif_hash algif_skcipher) $(call AddDepends/crypto) -- 2.19.1 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] Merged: tools/xz: Add PKG_CPE_ID for proper CVE tracking
Merged into my staging tree. Thank you! ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] Merged: tools/libressl: Add PKG_CPE_ID for proper CVE tracking
Merged into my staging tree. Thank you! ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] Compile juci on Ubuntu 18.04
Last Commit was on August 8. On 10/16/18 3:50 PM, Outback Dingo wrote: > On Tue, Oct 16, 2018 at 8:43 PM Nick wrote: >> Just compiled an Image with JUCI for WDR3600. >> When trying to flash >> >>> Invalid image, hardware ID mismatch, hw:4301 0001 >>> image:3601 0001. >> Is someone using juci? >> > no commits in 3+ years looks pretty dead to me. > > >> On 10/15/18 5:03 PM, Nick wrote: >>> I just followed "Usage on OpenWrt". >>> OpenWrt Commit ID: 9b4650b3b92e6246b986ac9e3d7c2a80d66b805b >>> >>> Here is the commit to fix the regex stuff: https://github.com/PolynomialDivision/openwrt/commit/c0d2080fa4253f34506360cddeb0c457683854b5 >>> On 10/15/2018 04:58 PM, Koen Vandeputte wrote: On 2018-10-15 16:20, Nick wrote: > Hi, > did someone manage to follow the Readme.md? > I got several problems when compiling juci in Xubuntu 18.04. > First where was a Regex mismatch. > And then npm makes trouble. > Now there is a new issue: > >> touch >> /home/user/openwrt_juci/staging_dir/target-x86_64_musl-1.1.14/stamp/.juci_installed >> >> make[3]: Leaving directory '/home/user/openwrt_juci/feeds/juci/juci' >> make[3]: Entering directory >> '/home/user/openwrt_juci/feeds/juci/libblobpack' >> Makefile:43: *** Download/default is missing the FILE field.. Stop. > There is a similar issue on github > (https://github.com/openwrt/packages/issues/5180). > I don't know how to move on. Some ideas? > > Best, > Nick > > > Hi, I'm seeing "musl-1.1.14" in the path above. How old is this? Koen ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel >>> ___ >>> openwrt-devel mailing list >>> openwrt-devel@lists.openwrt.org >>> https://lists.openwrt.org/mailman/listinfo/openwrt-devel >> ___ >> openwrt-devel mailing list >> openwrt-devel@lists.openwrt.org >> https://lists.openwrt.org/mailman/listinfo/openwrt-devel > ___ > openwrt-devel mailing list > openwrt-devel@lists.openwrt.org > https://lists.openwrt.org/mailman/listinfo/openwrt-devel ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] Compile juci on Ubuntu 18.04
On Tue, Oct 16, 2018 at 8:43 PM Nick wrote: > > Just compiled an Image with JUCI for WDR3600. > When trying to flash > > > Invalid image, hardware ID mismatch, hw:4301 0001 > > image:3601 0001. > Is someone using juci? > no commits in 3+ years looks pretty dead to me. > On 10/15/18 5:03 PM, Nick wrote: > > I just followed "Usage on OpenWrt". > > OpenWrt Commit ID: 9b4650b3b92e6246b986ac9e3d7c2a80d66b805b > > > > Here is the commit to fix the regex stuff: > >> https://github.com/PolynomialDivision/openwrt/commit/c0d2080fa4253f34506360cddeb0c457683854b5 > > On 10/15/2018 04:58 PM, Koen Vandeputte wrote: > >> > >> On 2018-10-15 16:20, Nick wrote: > >>> Hi, > >>> did someone manage to follow the Readme.md? > >>> I got several problems when compiling juci in Xubuntu 18.04. > >>> First where was a Regex mismatch. > >>> And then npm makes trouble. > >>> Now there is a new issue: > >>> > touch > /home/user/openwrt_juci/staging_dir/target-x86_64_musl-1.1.14/stamp/.juci_installed > > make[3]: Leaving directory '/home/user/openwrt_juci/feeds/juci/juci' > make[3]: Entering directory > '/home/user/openwrt_juci/feeds/juci/libblobpack' > Makefile:43: *** Download/default is missing the FILE field.. Stop. > >>> There is a similar issue on github > >>> (https://github.com/openwrt/packages/issues/5180). > >>> I don't know how to move on. Some ideas? > >>> > >>> Best, > >>> Nick > >>> > >>> > >>> > >> Hi, > >> > >> I'm seeing "musl-1.1.14" in the path above. > >> How old is this? > >> > >> Koen > >> > >> > >> ___ > >> openwrt-devel mailing list > >> openwrt-devel@lists.openwrt.org > >> https://lists.openwrt.org/mailman/listinfo/openwrt-devel > > > > ___ > > openwrt-devel mailing list > > openwrt-devel@lists.openwrt.org > > https://lists.openwrt.org/mailman/listinfo/openwrt-devel > > ___ > openwrt-devel mailing list > openwrt-devel@lists.openwrt.org > https://lists.openwrt.org/mailman/listinfo/openwrt-devel ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] Compile juci on Ubuntu 18.04
Just compiled an Image with JUCI for WDR3600. When trying to flash > Invalid image, hardware ID mismatch, hw:4301 0001 > image:3601 0001. Is someone using juci? On 10/15/18 5:03 PM, Nick wrote: > I just followed "Usage on OpenWrt". > OpenWrt Commit ID: 9b4650b3b92e6246b986ac9e3d7c2a80d66b805b > > Here is the commit to fix the regex stuff: >> https://github.com/PolynomialDivision/openwrt/commit/c0d2080fa4253f34506360cddeb0c457683854b5 > On 10/15/2018 04:58 PM, Koen Vandeputte wrote: >> >> On 2018-10-15 16:20, Nick wrote: >>> Hi, >>> did someone manage to follow the Readme.md? >>> I got several problems when compiling juci in Xubuntu 18.04. >>> First where was a Regex mismatch. >>> And then npm makes trouble. >>> Now there is a new issue: >>> touch /home/user/openwrt_juci/staging_dir/target-x86_64_musl-1.1.14/stamp/.juci_installed make[3]: Leaving directory '/home/user/openwrt_juci/feeds/juci/juci' make[3]: Entering directory '/home/user/openwrt_juci/feeds/juci/libblobpack' Makefile:43: *** Download/default is missing the FILE field.. Stop. >>> There is a similar issue on github >>> (https://github.com/openwrt/packages/issues/5180). >>> I don't know how to move on. Some ideas? >>> >>> Best, >>> Nick >>> >>> >>> >> Hi, >> >> I'm seeing "musl-1.1.14" in the path above. >> How old is this? >> >> Koen >> >> >> ___ >> openwrt-devel mailing list >> openwrt-devel@lists.openwrt.org >> https://lists.openwrt.org/mailman/listinfo/openwrt-devel > > ___ > openwrt-devel mailing list > openwrt-devel@lists.openwrt.org > https://lists.openwrt.org/mailman/listinfo/openwrt-devel ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH 2/2] treewide: use wpad-basic for not small flash targets
Hi, > From: Mathias Kresin > > Add out of the box support for 802.11r and 802.11w to all targets not > suffering from small flash. > > Signed-off-by: Mathias Kresin > Signed-off-by: Kevin Darbyshire-Bryant Acked-by: Jo-Philipp Wich ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH 1/2] hostapd: add basic variant
Hi, > Add a basic variant which provides WPA-PSK only, 802.11r and 802.11w. > > Signed-off-by: Kevin Darbyshire-Bryant Acked-by: Jo-Philipp Wich ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] patch: Add missing CVE
> On 15 Oct 2018, at 18:17, Rosen Penev wrote: > > uscan reports a new CVE now that PKG_CPE_ID was added. > > Reordered patches by date. > > Signed-off-by: Rosen Penev > --- > tools/patch/Makefile | 2 +- > tools/patch/patches/010-CVE-2018-6951.patch | 29 +++ > ...00156.patch => 020-CVE-2018-1000156.patch} | 20 +++-- > ...018-6952.patch => 030-CVE-2018-6952.patch} | 9 -- > 4 files changed, 48 insertions(+), 12 deletions(-) > create mode 100644 tools/patch/patches/010-CVE-2018-6951.patch > rename tools/patch/patches/{010-CVE-2018-1000156.patch => > 020-CVE-2018-1000156.patch} (89%) > rename tools/patch/patches/{020-CVE-2018-6952.patch => > 030-CVE-2018-6952.patch} (78%) > > diff --git a/tools/patch/Makefile b/tools/patch/Makefile > index 0f4d7f0326..7323b5b2ab 100644 > --- a/tools/patch/Makefile > +++ b/tools/patch/Makefile > @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk > > PKG_NAME:=patch > PKG_VERSION:=2.7.6 > -PKG_RELEASE:=2 > +PKG_RELEASE:=3 > PKG_CPE_ID:=cpe:/a:gnu:patch > > PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz > diff --git a/tools/patch/patches/010-CVE-2018-6951.patch > b/tools/patch/patches/010-CVE-2018-6951.patch > new file mode 100644 > index 00..5dbcb35e29 > --- /dev/null > +++ b/tools/patch/patches/010-CVE-2018-6951.patch > @@ -0,0 +1,29 @@ > +From 1f7853c05f9949d81da9be7a02b90cc64284d1f8 Mon Sep 17 00:00:00 2001 > +From: Andreas Gruenbacher > +Date: Mon, 12 Feb 2018 16:48:24 +0100 > +Subject: [PATCH] Fix segfault with mangled rename patch > + > +http://savannah.gnu.org/bugs/?53132 > +* src/pch.c (intuit_diff_type): Ensure that two filenames are specified > +for renames and copies (fix the existing check). > +--- > + src/pch.c | 3 ++- > + 1 file changed, 2 insertions(+), 1 deletion(-) > + > +diff --git a/src/pch.c b/src/pch.c > +index ff9ed2c..bc6278c 100644 > +--- a/src/pch.c > b/src/pch.c > +@@ -974,7 +974,8 @@ intuit_diff_type (bool need_header, mode_t *p_file_type) > + if ((pch_rename () || pch_copy ()) > + && ! inname > + && ! ((i == OLD || i == NEW) && > +- p_name[! reverse] && > ++ p_name[reverse] && p_name[! reverse] && > ++ name_is_valid (p_name[reverse]) && > + name_is_valid (p_name[! reverse]))) > + { > + say ("Cannot %s file without two valid file names\n", pch_rename () ? > "rename" : "copy"); > +-- > +2.19.1 > + > diff --git a/tools/patch/patches/010-CVE-2018-1000156.patch > b/tools/patch/patches/020-CVE-2018-1000156.patch > similarity index 89% > rename from tools/patch/patches/010-CVE-2018-1000156.patch > rename to tools/patch/patches/020-CVE-2018-1000156.patch > index 7114f82e8f..83b6d84637 100644 > --- a/tools/patch/patches/010-CVE-2018-1000156.patch > +++ b/tools/patch/patches/020-CVE-2018-1000156.patch > @@ -1,4 +1,4 @@ > -From ee2904728eb4364a36d62d66f723d0b68749e5df Mon Sep 17 00:00:00 2001 > +From b3a0ca3deed00334f9feece43f76776b6a168e47 Mon Sep 17 00:00:00 2001 > From: Andreas Gruenbacher > Date: Fri, 6 Apr 2018 12:14:49 +0200 > Subject: [PATCH] Fix arbitrary command execution in ed-style patches > @@ -10,12 +10,11 @@ instead of rejecting them and carrying on. > * tests/ed-style: New test case. > * tests/Makefile.am (TESTS): Add test case. > --- > - src/pch.c | 89 +++ > - tests/Makefile.am | 1 + > - tests/ed-style| 41 ++ > - 3 files changed, 108 insertions(+), 23 deletions(-) > - create mode 100644 tests/ed-style > + src/pch.c | 89 +-- > + 1 file changed, 66 insertions(+), 23 deletions(-) > > +diff --git a/src/pch.c b/src/pch.c > +index bc6278c..4fd5a05 100644 > --- a/src/pch.c > +++ b/src/pch.c > @@ -33,6 +33,7 @@ > @@ -26,7 +25,7 @@ instead of rejecting them and carrying on. > > #define INITHUNKMAX 125 /* initial dynamic allocation > size */ > > -@@ -2388,22 +2389,28 @@ do_ed_script (char const *inname, char c > +@@ -2389,22 +2390,28 @@ do_ed_script (char const *inname, char const > *outname, > static char const editor_program[] = EDITOR_PROGRAM; > > file_offset beginning_of_this_line; > @@ -69,7 +68,7 @@ instead of rejecting them and carrying on. > for (;;) { > char ed_command_letter; > beginning_of_this_line = file_tell (pfp); > -@@ -2414,14 +2421,14 @@ do_ed_script (char const *inname, char c > +@@ -2415,14 +2422,14 @@ do_ed_script (char const *inname, char const > *outname, > } > ed_command_letter = get_ed_command_letter (buf); > if (ed_command_letter) { > @@ -88,7 +87,7 @@ instead of rejecting them and carrying on. > write_fatal (); > if (chars_read == 2 && strEQ (buf, ".\n")) > break; > -@@ -2434,13 +2441,49 @@ do_ed_script (char const *inname, char c > +@@ -2435,13 +2442,49 @@ do_ed_script (char const *inname, char const > *outname, >
[OpenWrt-Devel] [PATCH] dnsmasq: fix dnsmasq failure to start when ujail'd
This patch fixes jailed dnsmasq running into the following issue: |dnsmasq[1]: cannot read /usr/share/dnsmasq/dhcpbogushostname.conf: No such file or directory |dnsmasq[1]: FAILED to start up |procd: Instance dnsmasq::cfg01411c s in a crash loop 6 crashes, 0 seconds since last crash Fixes: a45f4f50e16 ("dnsmasq: add dhcp-ignore-names support - CERT VU#598349") Signed-off-by: Christian Lamparter --- package/network/services/dnsmasq/files/dnsmasq.init | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/network/services/dnsmasq/files/dnsmasq.init b/package/network/services/dnsmasq/files/dnsmasq.init index 0c786e82c7..9c922eec6c 100644 --- a/package/network/services/dnsmasq/files/dnsmasq.init +++ b/package/network/services/dnsmasq/files/dnsmasq.init @@ -1028,7 +1028,7 @@ dnsmasq_start() procd_set_param respawn procd_add_jail dnsmasq ubus log - procd_add_jail_mount $CONFIGFILE $TRUSTANCHORSFILE $HOSTFILE $RFC6761FILE /etc/passwd /etc/group /etc/TZ /dev/null /dev/urandom $dnsmasqconffile $dnsmasqconfdir $resolvfile $user_dhcpscript /etc/hosts /etc/ethers /sbin/hotplug-call $EXTRA_MOUNT $DHCPSCRIPT + procd_add_jail_mount $CONFIGFILE $TRUSTANCHORSFILE $HOSTFILE $RFC6761FILE $DHCPBOGUSHOSTNAMEFILE /etc/passwd /etc/group /etc/TZ /dev/null /dev/urandom $dnsmasqconffile $dnsmasqconfdir $resolvfile $user_dhcpscript /etc/hosts /etc/ethers /sbin/hotplug-call $EXTRA_MOUNT $DHCPSCRIPT procd_add_jail_mount_rw /var/run/dnsmasq/ $leasefile procd_close_instance -- 2.19.1 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel