From patchwork Tue Dec 15 16:59:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rui Salvaterra X-Patchwork-Id: 1416582 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=MAvGBoBA; 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=K80H1diS; 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 4CwPgQ5zRyz9s1l for ; Wed, 16 Dec 2020 04:01:54 +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=qXZFdB/O5Fa5orFYcL17wk6oatXrT2S9sRKe872+QrU=; b=MAvGBoBAdhovHT3PvsJs1rjGw 7BiOvU9Bp4qFwY3rOggKQqxvRHOINgN+Tzf7p0yXsGEDqa8JbbM2kpfFGLRqdCgqpUuxSytxBv0vG l/bcev+sBM3r2GFeybAE4N0a70AZfoffjmLL8p0i6yKFwifIzoL0IoT9g0vBLtFrQkxoRTmSiOk0y UwZpbiMCKXzaoV9AIu10y8bq0/EBTGZMHb6riAMHc3CwNeSXB8hhlcHL2LpZEFal4dtUNZuzQLSdC opsDpfWyCTHDXpcFdi8J3AWDmtufk4cSRvEZGwfJmc3ZcX66XLiaNneP1GHf17xfHnAaK8/B3dM9k q4IYo/Iug==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kpDg9-0001Y9-8R; Tue, 15 Dec 2020 17:00:01 +0000 Received: from mail-qk1-x742.google.com ([2607:f8b0:4864:20::742]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kpDg2-0001VQ-DM for openwrt-devel@lists.openwrt.org; Tue, 15 Dec 2020 16:59:55 +0000 Received: by mail-qk1-x742.google.com with SMTP id b64so15782331qkc.12 for ; Tue, 15 Dec 2020 08:59:53 -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=b90bNc1TmYSxvaye5ylqnAoksK9kiiQNHZYsl9hVsz0=; b=K80H1diSDC192DrHAWISmtJtULTmv/EBCRusb0tvczGn8/YHRhRtrt9OsrEKfielhU yp09I+5Q5NPZ6Fw54zcYEoB+b4wUqc93qrjwTdFW0EDvqhvlpkwfIH5pDvhRIZVATF4f m9vSXqUmt5ZX0nsVf8bqP7bHZ94vHXb62g46DH1Z5Vx6akDPRoi6hdqSDpr1uWYlD4M5 vUn7GRSi6q4I9QDkranRQsSFkJ9hGTet3yJDCPOEQy9iIeMqCq/g1enkAs6hK9aJrcdm l7bJWeSEjxm82V9YC/ENFJbdl99rjFzClhvcJSzCNcXCeZSbqf6dVwavP6jFgLGIzwjD 3epw== 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=b90bNc1TmYSxvaye5ylqnAoksK9kiiQNHZYsl9hVsz0=; b=maofSaJxS9Nh61W7KRPUZeJjNl+zvyn51wiX02gIJ9UxueZgFgvXmF/fuWaLorIMwn viK7xs7KqXHz/JPPV4ZLI1g2YBtm6aPO8iXeXd/7oDDUxXvM4uve6YBt7i0CwWG8prEO IwrkTH4VG9ihnF3Ddc/e5vs60jO+kco4yMx9eUOi/jgcA1BaH5G4POcREU4LDgNnLZ0V rE7ya8Ig1fgVd1egzNmjwWwrqmownMOD31EON4Q7XG2GHFklFBPmTAKCc5kCIogZpNOT uG4nmMkOv15wVt7FdK/kyh4qY1p3XdARLRBLBLz1yjXHr1PUgV6pFRpkD9Ff16TpIRfA ISaw== X-Gm-Message-State: AOAM5329LN2caR2HVCajluf8D+/tLd5lqiLp4K80wppy/ycm0gtzp1fH jx4FOSOytzSJsbTfhS+Tqz/1CHWU+A== X-Google-Smtp-Source: ABdhPJyk7q8TVOiOm3xJBt/kV5D9SMf59mXGaKXYh/38ssTyiwN293d4j7ZSnBMRzlokd5r2W6IZAQ== X-Received: by 2002:a37:8ec7:: with SMTP id q190mr39243198qkd.258.1608051592412; Tue, 15 Dec 2020 08:59:52 -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.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Dec 2020 08:59:52 -0800 (PST) From: Rui Salvaterra To: openwrt-devel@lists.openwrt.org Subject: [PATCH v4 2/3] dropbear: create a submenu for encryption algorithms Date: Tue, 15 Dec 2020 16:59:41 +0000 Message-Id: <20201215165942.2194-3-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_115954_516479_E7CF20D7 X-CRM114-Status: GOOD ( 13.06 ) 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:742 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 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 | 4 +++- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/package/network/services/dropbear/Config.in b/package/network/services/dropbear/Config.in index 5b7be04ade..6d2b4cdfae 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 d0b6a4b7ea..1d131455a2 100644 --- a/package/network/services/dropbear/Makefile +++ b/package/network/services/dropbear/Makefile @@ -33,7 +33,7 @@ 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_RSA CONFIG_DROPBEAR_AES128 CONFIG_DROPBEAR_AES256 include $(INCLUDE_DIR)/package.mk @@ -139,6 +139,8 @@ DB_OPT_CONFIG = \ !!DROPBEAR_ECC_521|CONFIG_DROPBEAR_ECC_FULL|1|0 \ 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 TARGET_CFLAGS += -DARGTYPE=3 -ffunction-sections -fdata-sections -flto TARGET_LDFLAGS += -Wl,--gc-sections -flto=jobserver