From patchwork Tue Oct 13 12:54:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rui Salvaterra X-Patchwork-Id: 1381572 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=ConrjQwS; 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=kxBpHmYg; 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 4C9bCz64LVz9sRR for ; Tue, 13 Oct 2020 23:57:03 +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=C/ZI5JHL+3DczeHduqB7FICxGsuNTJy0abUM+FAFxUM=; b=ConrjQwSNjH7d/PJIEjiAffzb BHWIjvBeJSXlJjCY6qRu7ySRtI9FZNOyFaOWxbumkl5PBuONGcFsbXmeIjacUgTxFHDg5cWwVQjA+ ips9BRNJyJeZRRblqhZI4sxMgU4fXnaUgEUMKWs95XkdO8c0FngsKSzBK2eq4WkPNn15DpXP73Vig qDeQRqz1xRJFNnZ2epZUSMZbOug8vKfnA84SaAXhAKTz69U3aqFtHg7Wo1uX4yeidzb5Y7SigzF2I 6CJGGX5dEtRrbDL+MleJsuKdyOYnsJFs9WAOPVZKi41xH1AdWmcLIJSzc7/mRtXuTy99JKmorFTA1 QwpWLiqsQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kSJq4-0000TC-B3; Tue, 13 Oct 2020 12:55:36 +0000 Received: from mail-ej1-x642.google.com ([2a00:1450:4864:20::642]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kSJpx-0000Qn-4o for openwrt-devel@lists.openwrt.org; Tue, 13 Oct 2020 12:55:31 +0000 Received: by mail-ej1-x642.google.com with SMTP id u21so28123824eja.2 for ; Tue, 13 Oct 2020 05:55:28 -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=/YeV8Jr+VUwDxy/Sc30lHrvIbXB47x38AqOczmttfvc=; b=kxBpHmYgxcVRac1R5pXj7KGup86FrbG2w7+eL7neXtE2QxdiM5JEfCQVut1C8ZuAGl rQetBJyyaB28TUwF/WYtKM7W1xqgq19SgPBWeZzl72VryBfsDQn+UzzKUwP+nigRtmJV mu6QUL+Rl8ThELKpkmGyGyVBz0fH2lsNPPuaO33L9VnmEeE2SjDWQ3Zu47GpB6Y+UIPY 4lEbYhv/MJtBE06dQkoi7wv3rT3KRF3yJjG8rBp9e4fQh/M0ntPVp2tppnaM4lr00ykn homJ1caC12HtYG/o2AnXFodYbAH+4V/EPXgeoWMG94gKUwhBGJX8gmjwiq45XX7qr2cr psKw== 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=/YeV8Jr+VUwDxy/Sc30lHrvIbXB47x38AqOczmttfvc=; b=E7kYLQhvVTTJWT2UV3Tb0K4tEGn0fCiECrydWa3mf8fXfHNJdmRk9Mp2aprdzdDR3H cFzZrwbg1Q/GJRfni0LrC5Wx4zscEkVCsX1YQN3aPhIlkBcqI5FOR0ByTckCHTysl+nX 30NBtH2HZOe39oHJA2UzQCp++2t7fIWvrPDXGOnKHtmFajmeuhtowmqPZquDeODN4qEK p7KHrEZFyr17tU9JBuIFlJrynhA0G7G+LSJHvtccqj6oPToK6Smx79qKjoeX8xi/LCIo 3UQbhIccj8/RSmBaCWqGdC+4BV3xvyfvV7RbT3v7FxFcERUVhTmT9V3KMKYzHSwuUpj3 dXGg== X-Gm-Message-State: AOAM531IplAToTJIpXGZY88TniTpA7VL4vw6YpX3DKK34dqFR7B3T1p/ vQPUFrTAA3eu6DEVziSW9kkyy+Lprw== X-Google-Smtp-Source: ABdhPJwiNCj+4RIVydKcN0eQPmN9T5/Dg3dWzH73o6Ds2M2YHJj4bTJGEzlXJIntCnYcnZ/y1FVbPQ== X-Received: by 2002:a17:906:3455:: with SMTP id d21mr35276912ejb.89.1602593727642; Tue, 13 Oct 2020 05:55:27 -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.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Oct 2020 05:55:27 -0700 (PDT) From: Rui Salvaterra To: openwrt-devel@lists.openwrt.org Subject: [PATCH 2/3] dropbear: create a submenu for encryption algorithms Date: Tue, 13 Oct 2020 13:54:11 +0100 Message-Id: <20201013125411.114995-3-rsalvaterra@gmail.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201013125411.114995-2-rsalvaterra@gmail.com> References: <20201013125411.114995-1-rsalvaterra@gmail.com> <20201013125411.114995-2-rsalvaterra@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201013_085529_211099_F6B40C6A X-CRM114-Status: GOOD ( 12.61 ) 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:642 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 encryption algorithms (s)he requires (e.g., disabling AES and keeping only ChaCha20-Poly1305). The default selection maintains the current functionality. Additionally, make sure at least one encryption algorithm is selected, lest the build would fail. Signed-off-by: Rui Salvaterra --- package/network/services/dropbear/Config.in | 21 +++++++++++++++++++++ package/network/services/dropbear/Makefile | 12 +++++++++--- 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/package/network/services/dropbear/Config.in b/package/network/services/dropbear/Config.in index d2771eca93..9cea6242a6 100644 --- a/package/network/services/dropbear/Config.in +++ b/package/network/services/dropbear/Config.in @@ -64,6 +64,20 @@ config DROPBEAR_AUTOSEL_PK endmenu +menu "Encryption algorithm selection" + +config DROPBEAR_AES128 + bool "AES-128 support" + default y + help + This enables support for the 128-bit AES cipher + +config DROPBEAR_AES256 + bool "AES-256 support" + default y + help + This enables support for the 256-bit AES cipher + config DROPBEAR_CHACHA20POLY1305 bool "Chacha20-Poly1305 support" default y @@ -73,6 +87,13 @@ config DROPBEAR_CHACHA20POLY1305 Increases binary size by about 4 kB (MIPS). +config DROPBEAR_AUTOSEL_EA + def_bool y + depends on !(DROPBEAR_AES256 || DROPBEAR_CHACHA20POLY1305) + select DROPBEAR_AES128 + +endmenu + config DROPBEAR_CURVE25519 bool "Curve25519 support" default y diff --git a/package/network/services/dropbear/Makefile b/package/network/services/dropbear/Makefile index 2ab2cd396d..768058718c 100644 --- a/package/network/services/dropbear/Makefile +++ b/package/network/services/dropbear/Makefile @@ -30,9 +30,9 @@ PKG_FLAGS:=nonshared PKG_CONFIG_DEPENDS:= \ CONFIG_TARGET_INIT_PATH CONFIG_DROPBEAR_ECC CONFIG_DROPBEAR_ECC_FULL \ CONFIG_DROPBEAR_RSA CONFIG_DROPBEAR_CURVE25519 CONFIG_DROPBEAR_ZLIB \ - CONFIG_DROPBEAR_ED25519 CONFIG_DROPBEAR_CHACHA20POLY1305 \ - CONFIG_DROPBEAR_UTMP CONFIG_DROPBEAR_PUTUTLINE \ - CONFIG_DROPBEAR_DBCLIENT CONFIG_DROPBEAR_SCP + CONFIG_DROPBEAR_ED25519 CONFIG_DROPBEAR_AES128 CONFIG_DROPBEAR_AES256 \ + CONFIG_DROPBEAR_CHACHA20POLY1305 CONFIG_DROPBEAR_UTMP \ + CONFIG_DROPBEAR_PUTUTLINE CONFIG_DROPBEAR_DBCLIENT CONFIG_DROPBEAR_SCP include $(INCLUDE_DIR)/package.mk @@ -121,6 +121,12 @@ define Build/Configure echo '#define DROPBEAR_ED25519 $(if $(CONFIG_DROPBEAR_ED25519),1,0)' >> \ $(PKG_BUILD_DIR)/localoptions.h + echo '#define DROPBEAR_AES128 $(if $(CONFIG_DROPBEAR_AES128),1,0)' >> \ + $(PKG_BUILD_DIR)/localoptions.h + + echo '#define DROPBEAR_AES256 $(if $(CONFIG_DROPBEAR_AES256),1,0)' >> \ + $(PKG_BUILD_DIR)/localoptions.h + echo '#define DROPBEAR_CHACHA20POLY1305 $(if $(CONFIG_DROPBEAR_CHACHA20POLY1305),1,0)' >> \ $(PKG_BUILD_DIR)/localoptions.h