From patchwork Wed Jul 22 13:31:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rui Salvaterra X-Patchwork-Id: 1333887 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=PPcvUBAC; 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=eiKgmT7B; 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 4BBc144qtrz9sRN for ; Wed, 22 Jul 2020 23:35:52 +1000 (AEST) 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=mLomhbT4h6+nc5e41KSgv1WtOhBrOSmXfrhcBTblTy8=; b=PPcvUBAC6wiaRZztRThXu0Ssbh a5qHmy37NOvzU035L/uTnMPAE4z4TAY1iD/jeZuZhcb/ONivxOcIRx31umMMo/fynON9kRxSg3VSV JQFsbc3qcrmIUkbopt5xSbhfK235a48lskkqakmpcuFqa2E8KUT0c9P+8LvJ7m7FwFk1CFW1yaxFI F6jPWKwHxaSXMHDouv9myhlWmeahx17L80fwrBE8bhL0qul54WxANWmZrzyymLWsvTk5WV0OrCxqZ 9Oc2btg9xVWgPc9VHSqrsDL+G7SAPxnRrqgYgv0FlljFvRRihEpwLV8VLwp82l7UuBIib2pFufrf8 htTg9b0Q==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jyEso-0006Hf-H0; Wed, 22 Jul 2020 13:34:06 +0000 Received: from mail-pj1-x102d.google.com ([2607:f8b0:4864:20::102d]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jyEsl-0006GP-I6 for openwrt-devel@lists.openwrt.org; Wed, 22 Jul 2020 13:34:04 +0000 Received: by mail-pj1-x102d.google.com with SMTP id md7so1378200pjb.1 for ; Wed, 22 Jul 2020 06:34:01 -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:mime-version :content-transfer-encoding; bh=ret+4ycuviLrSbPhIOMMgnT44vyrHd5+nTIgYIkuUvY=; b=eiKgmT7BRi/FqLwV+9fYYDOz97sdAxKCMJRXbjSxdvkJJc4v8FtBe29hRWkDQgMQ9t tO8PVoUOkpx85Ori6/b2HTXRe7vGwbvi96Jys1M/UnBEOiqwG6tnyUT86pbkVfoeeG1z NkIRg1tp+QOeFNA9JcIS8zt1S4JeAE4FE2M/BwX+xuXCN2E6M1OSVq8mL+YyXI6Xs6Du HgY5E/K68B2aR0cv9Ucoxd5oXdmCaLKoWpswnpY8TcgnacGYmnpkfbIiXp7I3O8B9lAO MjpbMkACBOf1lyeG+B6pNIWxoTTxf6DtidqNWqydgX0ss8z3ft01iUBTYpMQme/CObn4 FXHQ== 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=ret+4ycuviLrSbPhIOMMgnT44vyrHd5+nTIgYIkuUvY=; b=C5H0zCZXKhlTk5uNCrFqFQ/4LY+6j1AQzBQxleYCnzUr3fc3ioXr3hXMkr9JOWwnw7 L4CSmQHS01ghZkjKMIbhvfCDdfazaKwdfztBlln80qXyTB0QBA6xvXpiQpy5aRnT8F9A tcDyQGANPnSCXq39G+3Lvs3YRY8qL740Xtp3yf7cfAi3qkhG1rNq7lqATpQybQycGrI7 ngG4MNOw4ieUKaED1NDsBZfJbXcKd1TZGRIigSV7B3vqTSlpZn4ZRCs1XyCydKM9wxOt JGB2+QDalGYn3G1RvEJsPPJ0CqlKtNksJOgsYq9OTFFQ+YnItp66Eif3ucF11x/WmA2F 57Fg== X-Gm-Message-State: AOAM5314HUCkfZGuY1B4hgKMccgLhcvOyTr611GlBmYlypoNIz/IFaxv ZSQo7exPDcjbwx7wcu0WMJOO/0c= X-Google-Smtp-Source: ABdhPJw72hGNxCNEYW2TQqc2OVe7w5KzntJZ1/f1cZejZnpriMDKl5OpsGalUuwUenkP7YX/Ve5epw== X-Received: by 2002:a17:90a:6281:: with SMTP id d1mr9925884pjj.231.1595424839363; Wed, 22 Jul 2020 06:33:59 -0700 (PDT) Received: from presler.lan (a109-49-6-66.cpe.netcabo.pt. [109.49.6.66]) by smtp.gmail.com with ESMTPSA id j16sm20227pgb.33.2020.07.22.06.33.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jul 2020 06:33:58 -0700 (PDT) From: Rui Salvaterra To: openwrt-devel@lists.openwrt.org Subject: [PATCH] dropbear: allow disabling support for scp Date: Wed, 22 Jul 2020 14:31:32 +0100 Message-Id: <20200722133131.247244-1-rsalvaterra@gmail.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200722_093403_607280_5945D4E8 X-CRM114-Status: UNSURE ( 8.31 ) X-CRM114-Notice: Please train this message. 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:102d listed in] [list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [rsalvaterra[at]gmail.com] -0.0 SPF_PASS SPF: sender matches SPF record -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_SIGNED Message has a DKIM or DK signature, not necessarily valid -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 If not needed, disabling scp allows for a nice size reduction. Dropbear executable size comparison: 153621 bytes (baseline) 133077 bytes (without scp) In other words, we trim a total of 20544 bytes. [Note: This patch is on top of "dropbear: fix ssh alternative when dbclient isn't built"] Signed-off-by: Rui Salvaterra --- package/network/services/dropbear/Config.in | 4 ++++ package/network/services/dropbear/Makefile | 8 +++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/package/network/services/dropbear/Config.in b/package/network/services/dropbear/Config.in index 0ac84ee206..b9ecbc815b 100644 --- a/package/network/services/dropbear/Config.in +++ b/package/network/services/dropbear/Config.in @@ -102,4 +102,8 @@ config DROPBEAR_DBCLIENT bool "Build dropbear with dbclient" default y +config DROPBEAR_SCP + bool "Build dropbear with scp" + default y + endmenu diff --git a/package/network/services/dropbear/Makefile b/package/network/services/dropbear/Makefile index edd20909b1..8b57b214ae 100644 --- a/package/network/services/dropbear/Makefile +++ b/package/network/services/dropbear/Makefile @@ -31,7 +31,7 @@ PKG_CONFIG_DEPENDS:= \ 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_DBCLIENT CONFIG_DROPBEAR_SCP include $(INCLUDE_DIR)/package.mk @@ -53,7 +53,9 @@ define Package/dropbear CATEGORY:=Base system TITLE:=Small SSH2 client/server DEPENDS:= +DROPBEAR_ZLIB:zlib - ALTERNATIVES:=100:/usr/bin/scp:/usr/sbin/dropbear + ALTERNATIVES:= + $(if $(CONFIG_DROPBEAR_SCP),ALTERNATIVES+= \ + 100:/usr/bin/scp:/usr/sbin/dropbear,) $(if $(CONFIG_DROPBEAR_DBCLIENT),ALTERNATIVES+= \ 100:/usr/bin/ssh:/usr/sbin/dropbear,) @@ -149,7 +151,7 @@ endef define Build/Compile +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ $(TARGET_CONFIGURE_OPTS) \ - PROGRAMS="dropbear $(if $(CONFIG_DROPBEAR_DBCLIENT),dbclient,) dropbearkey scp" \ + PROGRAMS="dropbear $(if $(CONFIG_DROPBEAR_DBCLIENT),dbclient,) dropbearkey $(if $(CONFIG_DROPBEAR_SCP),scp,)" \ MULTI=1 SCPPROGRESS=1 +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ $(TARGET_CONFIGURE_OPTS) \