From patchwork Tue Oct 13 12:54:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rui Salvaterra X-Patchwork-Id: 1381571 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=j9HUSwX/; 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=k27+Z5nK; 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 4C9bCy2N9bz9sRk for ; Tue, 13 Oct 2020 23:57:02 +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=f+fQDQEcys7AJ+ac2BWbgGX9dcqX3fHJ5vza3jj+uQw=; b=j9HUSwX/G+oAXA68auC67j9dW 8gjLG+dYoW1Nqj4q8mczAj/e+Cwqioy4Ub/WlTovO5JZibc9zl0tesgrRZLxkG90XKyXcV8wwBIlq +Fntt6dnf54LiwRvUR+LVHQZOicR+swaq65qnVHlE+Gyw/kgvB6pVZkVDbBG1Ncuxz/QNmLqdeIYA ANSuypirWp35f/RoKViRWiUOs2sbX9/cgwPF+q9hSNCLYbfkH2XHsCWJlaurCMJ7hv1wogCahF/fN cT4ui4e1OCeaJXM6ISWIMrZCqLB7o/bK0vO+EvQ+9tFu6BIWEpb2pFJSug7LYv/iuonwnbvI0UQ7V 7ay/v3HcA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kSJq6-0000Tq-S8; Tue, 13 Oct 2020 12:55:38 +0000 Received: from mail-ed1-x544.google.com ([2a00:1450:4864:20::544]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kSJpy-0000RB-5H for openwrt-devel@lists.openwrt.org; Tue, 13 Oct 2020 12:55:32 +0000 Received: by mail-ed1-x544.google.com with SMTP id g4so20839411edk.0 for ; Tue, 13 Oct 2020 05:55:29 -0700 (PDT) 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=bkA7ntPUCHhruOUye8YSikGYB/DkypdIiOW1c7aitMs=; b=k27+Z5nKCCivsqkHWMam1t0Nbe7xPHszd3KuZuSkT9BNQn9iMjvvwCQZstvC5kcMgx JOxbmWTyfVPIzqt2+gXKhv0PQpqgyNjmlcdX5o6af9L6GdAjSvDa3E1X72P9CfO0uBXz Ns9iuqXG/anQL4l/15/Q60vBd+DFdnXxdIwpF203N/sa0cp3Qre2qCS2Qn+FhG78rJXU 2pMFMz43HYbgLMARqWNnIG11oVqum9QImvXprmZMc3fVGv/4h+Q+ry15g2N5nbkXqWI3 HJCLvyI6ycsEwk6SRSv4FWGr7ucEQmQIHiftjr3c1GrEobANywyh+Dmt0SyII4vj20tW oszg== 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=bkA7ntPUCHhruOUye8YSikGYB/DkypdIiOW1c7aitMs=; b=IobvCeiFBYnqoysnCNU6qgsP5A/VVj/oKw6+3GmSbE9TvJTbbbRAsDvTlQlIlRE/GB VvQLm2TbKC6Weiak1tKqjPQ4xlqHD1jSxVKCZQwjbjGrNcVXdFXlJRnc/VGhNTmldlIs LeohS4q6Vy1olsCCj0i9/FBl+juD+Mw5LivkS2F25CVyCfXKqd8VPxgUXiy7PslQH5XH aXTJNswfuRMbLwcpSCNAHWDNA9AsWuoTf6tVX+792RUGkGoMjvu6HLLgRuEgJZfHskc5 2zAbCUyZ0Tqb/AyIMU4dDkRp80kDWRoEXOORK/05XVc6pUAkgckPRbPDWGzbEAXxqUQ6 8vgQ== X-Gm-Message-State: AOAM531vrOUWifBIqeqIC0qtTbBpkYRIbv2fAGWn29Yel4eqP7NmN2bn XSyFvH6u+yfQmvBi2FTpK4zDrYiBZQ== X-Google-Smtp-Source: ABdhPJzrJlZequ4kI33VGjAlJytkBe6nZbBaJLaJdM7a/6yehZFUClBcNKnCmgCrRoFoC+w/H53e9Q== X-Received: by 2002:a05:6402:782:: with SMTP id d2mr3306106edy.131.1602593728497; Tue, 13 Oct 2020 05:55:28 -0700 (PDT) Received: from presler.lan (a95-93-122-112.cpe.netcabo.pt. [95.93.122.112]) by smtp.gmail.com with ESMTPSA id o13sm12199666ejr.120.2020.10.13.05.55.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Oct 2020 05:55:28 -0700 (PDT) From: Rui Salvaterra To: openwrt-devel@lists.openwrt.org Subject: [PATCH 3/3] dropbear: create a submenu for key exchange algorithms Date: Tue, 13 Oct 2020 13:54:12 +0100 Message-Id: <20201013125411.114995-4-rsalvaterra@gmail.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201013125411.114995-3-rsalvaterra@gmail.com> References: <20201013125411.114995-1-rsalvaterra@gmail.com> <20201013125411.114995-2-rsalvaterra@gmail.com> <20201013125411.114995-3-rsalvaterra@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201013_085530_260395_F0E0BC16 X-CRM114-Status: GOOD ( 11.83 ) 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:544 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 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.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's 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 | 12 ++++++++++++ package/network/services/dropbear/Makefile | 13 ++++++++++--- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/package/network/services/dropbear/Config.in b/package/network/services/dropbear/Config.in index 9cea6242a6..066dab0a9b 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,8 @@ config DROPBEAR_CURVE25519 Increases binary size by about 4 kB (MIPS). +endmenu + config DROPBEAR_ZLIB bool "Enable compression" default n diff --git a/package/network/services/dropbear/Makefile b/package/network/services/dropbear/Makefile index 768058718c..d0b0dbf3dc 100644 --- a/package/network/services/dropbear/Makefile +++ b/package/network/services/dropbear/Makefile @@ -32,6 +32,7 @@ PKG_CONFIG_DEPENDS:= \ CONFIG_DROPBEAR_RSA CONFIG_DROPBEAR_CURVE25519 CONFIG_DROPBEAR_ZLIB \ CONFIG_DROPBEAR_ED25519 CONFIG_DROPBEAR_AES128 CONFIG_DROPBEAR_AES256 \ CONFIG_DROPBEAR_CHACHA20POLY1305 CONFIG_DROPBEAR_UTMP \ + CONFIG_DROPBEAR_DH_GROUP14_SHA1 CONFIG_DROPBEAR_DH_GROUP14_SHA256 \ CONFIG_DROPBEAR_PUTUTLINE CONFIG_DROPBEAR_DBCLIENT CONFIG_DROPBEAR_SCP include $(INCLUDE_DIR)/package.mk @@ -110,9 +111,6 @@ define Build/Configure echo '#define DROPBEAR_RSA $(if $(CONFIG_DROPBEAR_RSA),1,0)' >> \ $(PKG_BUILD_DIR)/localoptions.h - echo '#define DROPBEAR_CURVE25519 $(if $(CONFIG_DROPBEAR_CURVE25519),1,0)' >> \ - $(PKG_BUILD_DIR)/localoptions.h - for OPTION in DROPBEAR_ECDSA DROPBEAR_ECDH; do \ echo "#define $$$$OPTION $(if $(CONFIG_DROPBEAR_ECC),1,0)" >> \ $(PKG_BUILD_DIR)/localoptions.h; \ @@ -130,6 +128,15 @@ define Build/Configure echo '#define DROPBEAR_CHACHA20POLY1305 $(if $(CONFIG_DROPBEAR_CHACHA20POLY1305),1,0)' >> \ $(PKG_BUILD_DIR)/localoptions.h + echo '#define DROPBEAR_DH_GROUP14_SHA1 $(if $(CONFIG_DROPBEAR_DH_GROUP14_SHA1),1,0)' >> \ + $(PKG_BUILD_DIR)/localoptions.h + + echo '#define DROPBEAR_DH_GROUP14_SHA256 $(if $(CONFIG_DROPBEAR_DH_GROUP14_SHA256),1,0)' >> \ + $(PKG_BUILD_DIR)/localoptions.h + + echo '#define DROPBEAR_CURVE25519 $(if $(CONFIG_DROPBEAR_CURVE25519),1,0)' >> \ + $(PKG_BUILD_DIR)/localoptions.h + # remove protocol idented software version number $(ESED) 's,^(#define LOCAL_IDENT) .*$$$$,\1 "SSH-2.0-dropbear",g' \ $(PKG_BUILD_DIR)/sysoptions.h