From patchwork Tue Dec 15 16:59:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rui Salvaterra X-Patchwork-Id: 1416584 X-Patchwork-Delegate: rsalvaterra@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=1OTft0IL; 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=g9Inwfqp; 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 4CwPgh1Pxhz9s1l for ; Wed, 16 Dec 2020 04:02:08 +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:References:In-Reply-To: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:List-Owner; bh=jpVqVIOieYVIMpkXg/B+TIbtkto0KxUPfQ/kjlVukHE=; b=1OTft0ILZdFehG5zEVvsBGUcy A0GbuTKr63KUQs91aFtx8MQVYTlRmUCporLwhZ6Qs8TaP5cWvbpOfL9R9sRiswK1oqugfSxU/L8hP x5cTbK8TfH/v/8qzGa000ISInz50UsExIue+wjK+EjhJhMuRR7/PZfABtUmc9VuGPHXIzO5SPjSvM kD7JnK6oynUOy9mCqABFUIH/G6uZLThCXYEXQttIqTRCIM48GbIUAh+4EoDKmR6Mx/CYoKXPoCRpj suaKyaphwfrleMAPsI5M5rdzqNJqBLOGGNi05Oqis7a7FDYC9SwaQaqjXv9Kqv94xoPMbs/cU822v yr1nOCyRA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kpDgD-0001Zm-VK; Tue, 15 Dec 2020 17:00:06 +0000 Received: from mail-qv1-xf44.google.com ([2607:f8b0:4864:20::f44]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kpDg3-0001Vx-Ex for openwrt-devel@lists.openwrt.org; Tue, 15 Dec 2020 16:59:56 +0000 Received: by mail-qv1-xf44.google.com with SMTP id u16so9882544qvl.7 for ; Tue, 15 Dec 2020 08:59:54 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=pwNijvsYtN2tZb8fecS4Q42Zy8uLh8/eYp4iue2hnVk=; b=g9InwfqpOdLvNBaI0BLsSFudmam7/VWG17GLofAK+LqEE5vIIfEScryP0wvj4JBj0N LLYN/Sst++7Mow+EfV/cGyJcWZjcXuVpaxkSYXy0hS86sdssYvQ/7PmMhiRlcbMouEy9 R1I1LKgbh0vy5BvhhuVOEH35H4t0JOgPpAbnGSofnj0nCk2PfAsx4MMgb0FoeVfum9td EKJazUWZkzTBhwZePH7mGVZH5nLxanvSOQl5JXfKPE8mxoCcs9gh8nSLjDFwlRydGUQS wqZL7g8YqBrmmO2w2SFSFPZ6HpmR5H9HNIb6+WXQnhrJax0cCzAKn56JMcM8+DwJQC9E pUhw== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=pwNijvsYtN2tZb8fecS4Q42Zy8uLh8/eYp4iue2hnVk=; b=HWHwhSDrWgnzfFr3aYkyBFKPxg52gHsfMtcEzlh01q7ZytNdygDE9AQbwxl3i6mm46 MEs+cP7CohmjGjSWlHUznmu7+DxPI5Q9hQtDpsGVTrWiXNDB6Up7buA+5BYDbPtDI1a/ tK3hbPFMoWtd3FSYVHRiS9xwq/J91bg1Mq8H4s2g6md5IvmCsGnVhz8mTau48q+AHDwY y4FaoWc0EQlh4W/P5N5NSIwyg6IEFCMPmScNxqvV578YaamN53yZFjVYJqaFPHU9t0X7 Sduan1G3FCbWjF+LfeG2mWVwYeeMmQuRnOLzK/qubBAEZdssfTFQb4dNaIe0pKBHn3GU kyIw== X-Gm-Message-State: AOAM530s9mpMuA4s2FhoxJs5FZpV45tsLiBiuMzS/FvzWlz3x2YG8j88 sFOlY44nX8XTNydLe2ZKG8VG0DEN8g== X-Google-Smtp-Source: ABdhPJz6oPPaxID0kKdEglnoixtbpD6FLzGgNO7+E0RkoL65N+L8mS3DWXq4aKJSHs6HCHqKwNgN6Q== X-Received: by 2002:a0c:dc13:: with SMTP id s19mr17113497qvk.26.1608051593610; Tue, 15 Dec 2020 08:59:53 -0800 (PST) Received: from presler.lan (a95-94-74-213.cpe.netcabo.pt. [95.94.74.213]) by smtp.gmail.com with ESMTPSA id n9sm16110388qti.75.2020.12.15.08.59.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Dec 2020 08:59:53 -0800 (PST) From: Rui Salvaterra To: openwrt-devel@lists.openwrt.org Subject: [PATCH v4 3/3] dropbear: create a submenu for key exchange algorithms Date: Tue, 15 Dec 2020 16:59:42 +0000 Message-Id: <20201215165942.2194-4-rsalvaterra@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201215165942.2194-1-rsalvaterra@gmail.com> References: <20201215165942.2194-1-rsalvaterra@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201215_115955_546762_0807F599 X-CRM114-Status: GOOD ( 12.29 ) 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 [2607:f8b0:4864:20:0:0:0:f44 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [rsalvaterra[at]gmail.com] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 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 -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 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: Rui Salvaterra Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org This allows the user to select only the key exchange algorithms (s)he requires (e.g., disabling group 14 SHA-{1,256} and keeping only Curve25519). The default selection maintains the current functionality. Additionally, make sure at least one key exchange algorithm is selected, lest the build would fail. Signed-off-by: Rui Salvaterra --- package/network/services/dropbear/Config.in | 17 +++++++++++++++++ package/network/services/dropbear/Makefile | 7 +++++-- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/package/network/services/dropbear/Config.in b/package/network/services/dropbear/Config.in index 6d2b4cdfae..b0ad21f907 100644 --- a/package/network/services/dropbear/Config.in +++ b/package/network/services/dropbear/Config.in @@ -94,6 +94,16 @@ config DROPBEAR_AUTOSEL_EA endmenu +menu "Key exchange algorithm selection" + +config DROPBEAR_DH_GROUP14_SHA1 + bool "Group 14 SHA-1" + default y + +config DROPBEAR_DH_GROUP14_SHA256 + bool "Group 14 SHA-256" + default y + config DROPBEAR_CURVE25519 bool "Curve25519 support" default y @@ -103,6 +113,13 @@ config DROPBEAR_CURVE25519 Increases binary size by about 4 kB (MIPS). +config DROPBEAR_AUTOSEL_KEX + def_bool y + depends on !(DROPBEAR_DH_GROUP14_SHA1 || DROPBEAR_CURVE25519) + select DROPBEAR_DH_GROUP14_SHA256 + +endmenu + config DROPBEAR_ZLIB bool "Enable compression" default n diff --git a/package/network/services/dropbear/Makefile b/package/network/services/dropbear/Makefile index 1d131455a2..7a6cc96f94 100644 --- a/package/network/services/dropbear/Makefile +++ b/package/network/services/dropbear/Makefile @@ -33,7 +33,8 @@ PKG_CONFIG_DEPENDS:= \ CONFIG_DROPBEAR_ED25519 CONFIG_DROPBEAR_CHACHA20POLY1305 \ CONFIG_DROPBEAR_UTMP CONFIG_DROPBEAR_PUTUTLINE \ CONFIG_DROPBEAR_DBCLIENT CONFIG_DROPBEAR_SCP CONFIG_DROPBEAR_ASKPASS \ - CONFIG_DROPBEAR_RSA CONFIG_DROPBEAR_AES128 CONFIG_DROPBEAR_AES256 + CONFIG_DROPBEAR_RSA CONFIG_DROPBEAR_AES128 CONFIG_DROPBEAR_AES256 \ + DROPBEAR_DH_GROUP14_SHA1 DROPBEAR_DH_GROUP14_SHA256 include $(INCLUDE_DIR)/package.mk @@ -140,7 +141,9 @@ DB_OPT_CONFIG = \ DROPBEAR_CLI_ASKPASS_HELPER|CONFIG_DROPBEAR_ASKPASS|1|0 \ DROPBEAR_RSA|CONFIG_DROPBEAR_RSA|1|0 \ DROPBEAR_AES128|CONFIG_DROPBEAR_AES128|1|0 \ - DROPBEAR_AES256|CONFIG_DROPBEAR_AES256|1|0 + DROPBEAR_AES256|CONFIG_DROPBEAR_AES256|1|0 \ + DROPBEAR_DH_GROUP14_SHA1|CONFIG_DROPBEAR_DH_GROUP14_SHA1|1|0 \ + DROPBEAR_DH_GROUP14_SHA256|CONFIG_DROPBEAR_DH_GROUP14_SHA256|1|0 TARGET_CFLAGS += -DARGTYPE=3 -ffunction-sections -fdata-sections -flto TARGET_LDFLAGS += -Wl,--gc-sections -flto=jobserver