From patchwork Sat Nov 14 12:11:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Hans Dedecker X-Patchwork-Id: 1400254 X-Patchwork-Delegate: dedeckeh@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=xaKaKfA7; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=Q58D1uor; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CYDm64S6Wz9sPB for ; Sat, 14 Nov 2020 23:14:30 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To:From: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=0KRnr4HgIBs6Wf15H7i/+rQG5Z8pnSZMKNLN9gxd4sA=; b=xaKaKfA76zP627U1Eoxb2TFnrK PCPRkF8q2TbmBGyqqcz/7POVzY24bFCUlcJV2m6IJ7rhXngOuV9ao6YzT7KvqSHgGpEu5iTyF6ABv w61DMnsdJIpvM133G8Ids1vaD/DVdynH6pQS0nQhWAzdET84cDxV66NcaCL0zNlTzKOaSjsZcxV+2 XKr8SYQHC6zgMKOGINQ1moJ4djKp1oMdy6GK8b19GR3J4tFA9IhY68E5viF3ihSugLWZUsp6GTc+7 fx+6P/bJgZ/LqsVxc22TwkcweW18np1oOsNCBWC+jBYhcoES3wlWHHAJ3wB+Vuc7luucd3/rSUt0S Fyirhsxw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kduPf-0003Yv-Sg; Sat, 14 Nov 2020 12:12:15 +0000 Received: from mail-ej1-x641.google.com ([2a00:1450:4864:20::641]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kduPd-0003Yc-DE for openwrt-devel@lists.openwrt.org; Sat, 14 Nov 2020 12:12:14 +0000 Received: by mail-ej1-x641.google.com with SMTP id i19so17676613ejx.9 for ; Sat, 14 Nov 2020 04:12:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=T9UfG9kK8V5bGyuepKhUjvGnjvxNDNDIQyx0wYHLNOk=; b=Q58D1uor75MIh74snFOTYs0ORoVYVktwvNNDiKr8Su9UgWAxYwXji///sSLv7zlPQm 81aXXYSV5MNnhH09/nax9Meq5pNOD4M4ZAnjJVI5mvzswqjzzC2hZpWEyKHP2bL2dVuG YMGXQVNNugLqmq/Vbfj6WKfyb6WWhTTP39eS+QBoRNX7OHNhQeldCYAiPHlRIyODsomp ET5TfvGUs89cgOYZUXY+P5CWji+xAdvIGfPPK0I6A6uQ6O2AJ2P6qQO8inYzoviNHQAh 6+fa18lkV6s/mdlgUWO7jPiqplXJQkhZD8FeA37qmZOffG8unLwKWjmMdDKrPalxc6j2 7JRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=T9UfG9kK8V5bGyuepKhUjvGnjvxNDNDIQyx0wYHLNOk=; b=kLWUutvdRCWPNV16vMyaWmGsQswiEhNhfD47K1KdqgtQm+mcIJStpBeJJdX9yyb2oo LJ7HuXYBvLhKpMVmeHSrCLecUuh5Knj9gnIp6z48i/RTp5IgOb0U485+ssUhdjMQ9zSl hgbBvyL87Jx3eaDnmrwXJssUBrxoTQAqNUFF3D0pe8gNvEwNPstZhkdjDrL2KpfOC6no RsrnjrXjZK6kdZJ1veuRNB6vcYFh1QC/nV5HM6hHEtd1hPa0OQPC8VZWSh0MnsAHUHNG 3HtdpHMdgIXQLN0ezc+stLr/xBH27B/cgxhBVzrEK8zYDUe0eG7oBNPrqEv7386N5GDY hRyg== X-Gm-Message-State: AOAM530o72UtWzqRIwKn8tomX7aHssJXEPOoPnqZT/9F3ckQ27jA4LFw YzdF6A9B/BYlAmIm7b/pXOxlFgnlh1Rv0Q== X-Google-Smtp-Source: ABdhPJz2y+csfyLyOo0R59sk/ieER+D8KRU2DSRhl4Uu948SHXXg0NHPtXxYVu2/IDpF7ktZR1TuHw== X-Received: by 2002:a17:906:134e:: with SMTP id x14mr6578123ejb.173.1605355930451; Sat, 14 Nov 2020 04:12:10 -0800 (PST) Received: from localhost.localdomain (ptr-fvgfo5tf68lvm1cgvhz.18120a2.ip6.access.telenet.be. [2a02:1812:1109:7d00:c070:7e0c:3ec4:5377]) by smtp.gmail.com with ESMTPSA id f18sm6684332edt.32.2020.11.14.04.12.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 Nov 2020 04:12:09 -0800 (PST) From: Hans Dedecker To: openwrt-devel@lists.openwrt.org Subject: [PATCH] dropbear: update to 2.81 Date: Sat, 14 Nov 2020 13:11:58 +0100 Message-Id: <20201114121158.71690-1-dedeckeh@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201114_071213_497135_982AF971 X-CRM114-Status: GOOD ( 14.27 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:641 listed in] [list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [dedeckeh[at]gmail.com] -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Hans Dedecker Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org Update dropbear to latest stable 2.81; for the changes see https://matt.ucc.asn.au/dropbear/CHANGES Refresh patches Signed-off-by: Hans Dedecker --- package/network/services/dropbear/Makefile | 6 +++--- .../network/services/dropbear/patches/110-change_user.patch | 2 +- .../services/dropbear/patches/160-lto-jobserver.patch | 4 ++-- .../910-signkey-fix-use-of-rsa-sha2-256-pubkeys.patch | 4 +--- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/package/network/services/dropbear/Makefile b/package/network/services/dropbear/Makefile index 1ecca2feb1..8520426382 100644 --- a/package/network/services/dropbear/Makefile +++ b/package/network/services/dropbear/Makefile @@ -8,14 +8,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dropbear -PKG_VERSION:=2020.80 -PKG_RELEASE:=4 +PKG_VERSION:=2020.81 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:= \ http://matt.ucc.asn.au/dropbear/releases/ \ https://dropbear.nl/mirror/releases/ -PKG_HASH:=d927941b91f2da150b2033f1a88b6a47999bf0afb1493a73e9216cffdb5d7949 +PKG_HASH:=48235d10b37775dbda59341ac0c4b239b82ad6318c31568b985730c788aac53b PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE libtomcrypt/LICENSE libtommath/LICENSE diff --git a/package/network/services/dropbear/patches/110-change_user.patch b/package/network/services/dropbear/patches/110-change_user.patch index f66b319100..1dd67948af 100644 --- a/package/network/services/dropbear/patches/110-change_user.patch +++ b/package/network/services/dropbear/patches/110-change_user.patch @@ -1,6 +1,6 @@ --- a/svr-chansession.c +++ b/svr-chansession.c -@@ -950,12 +950,12 @@ static void execchild(const void *user_d +@@ -954,12 +954,12 @@ static void execchild(const void *user_d /* We can only change uid/gid as root ... */ if (getuid() == 0) { diff --git a/package/network/services/dropbear/patches/160-lto-jobserver.patch b/package/network/services/dropbear/patches/160-lto-jobserver.patch index dbba613ac3..1ba7dd6f44 100644 --- a/package/network/services/dropbear/patches/160-lto-jobserver.patch +++ b/package/network/services/dropbear/patches/160-lto-jobserver.patch @@ -1,6 +1,6 @@ --- a/Makefile.in +++ b/Makefile.in -@@ -199,17 +199,17 @@ dropbearkey: $(dropbearkeyobjs) +@@ -198,17 +198,17 @@ dropbearkey: $(dropbearkeyobjs) dropbearconvert: $(dropbearconvertobjs) dropbear: $(HEADERS) $(LIBTOM_DEPS) Makefile @@ -22,7 +22,7 @@ # multi-binary compilation. -@@ -220,7 +220,7 @@ ifeq ($(MULTI),1) +@@ -219,7 +219,7 @@ ifeq ($(MULTI),1) endif dropbearmulti$(EXEEXT): $(HEADERS) $(MULTIOBJS) $(LIBTOM_DEPS) Makefile diff --git a/package/network/services/dropbear/patches/910-signkey-fix-use-of-rsa-sha2-256-pubkeys.patch b/package/network/services/dropbear/patches/910-signkey-fix-use-of-rsa-sha2-256-pubkeys.patch index afa0ebb310..b774a38b1a 100644 --- a/package/network/services/dropbear/patches/910-signkey-fix-use-of-rsa-sha2-256-pubkeys.patch +++ b/package/network/services/dropbear/patches/910-signkey-fix-use-of-rsa-sha2-256-pubkeys.patch @@ -19,11 +19,9 @@ Signed-off-by: Petr Štetiar signkey.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) -diff --git a/signkey.c b/signkey.c -index 92fe6a242cd0..d16ab174d83a 100644 --- a/signkey.c +++ b/signkey.c -@@ -657,8 +657,12 @@ int buf_verify(buffer * buf, sign_key *key, enum signature_type expect_sigtype, +@@ -657,8 +657,12 @@ int buf_verify(buffer * buf, sign_key *k sigtype = signature_type_from_name(type_name, type_name_len); m_free(type_name);