From patchwork Thu Apr 22 06:54:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Danzberger X-Patchwork-Id: 1468997 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1:d65d:64ff:fe57:4e05; helo=desiato.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) 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=desiato.20200630 header.b=nGs9n4UH; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=dd-wrt.com header.i=@dd-wrt.com header.a=rsa-sha256 header.s=mikd header.b=k5OsGXar; dkim-atps=neutral Received: from desiato.infradead.org (desiato.infradead.org [IPv6:2001:8b0:10b:1:d65d:64ff:fe57:4e05]) (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 4FQpBN6TM0z9sV5 for ; Thu, 22 Apr 2021 16:57:00 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:Subject:MIME-Version:Message-Id:Date:Cc: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=c6Mqbij+varw97uywxTaUeP7IXXb344B8VBmXpoKpWg=; b=nGs9n4UHhSRQ7QAGPrTRAYYMrn maCz3b1/+ed+uFUJNdkmw26DXtTzx6+RMHM5/OuF8AaYrr4g+khWHqjdUHYE49tbWS89bMcsSIdxV R40XSUSBofMYL4hTR0YaJlJ5LW7UKFvqN3Knt6D0aJL+WwbYYH2OBsbeiuv/wY2TOi2kgCGL2YDZB HaDOrs90cGd+zxxEnU1rY1QAG+dQ+EI4TlHK7gSxoJTYrldcgw1V2Yx8LNB1sb4KPioanrrqEO1g8 /O2+RG5Fq81IUn+1p610PJ12enqvz6DtOqUL4D6SwZ18R0TVYRJHPD7XqkQj9nDVdNS2UysDcWnu/ mLTN2JjA==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lZTEc-00G4EF-NJ; Thu, 22 Apr 2021 06:54:46 +0000 Received: from smtps.newmedia-net.de ([2a05:a1c0:0:de::167] helo=webmail.newmedia-net.de) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lZTEW-00G4DW-EV for openwrt-devel@lists.openwrt.org; Thu, 22 Apr 2021 06:54:42 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=dd-wrt.com; s=mikd; h=Subject:Content-Transfer-Encoding:MIME-Version:Message-Id:Date:Cc:To:From; bh=Veh6QazENeiOjyykXyS58J9f15swJTVGIZf4Z/kIAQQ=; b=k5OsGXarlRHeJI7h+YS1cB7rkE+LKANnQPvwfuN3uVcC1I6HOsSI+oYqPtBqEGEz5iKNcbb3+Jeg8u8ETyp/LOjmKMO7ZnbXw9Ep0pvk4/qHEsvpKW1I624AwzDP9/7VS7lUbTevsORB6G+0LvV5yCieDA338XZ76n8Woz40xC0=; From: Daniel Danzberger To: openwrt-devel@lists.openwrt.org Cc: Daniel Danzberger Date: Thu, 22 Apr 2021 08:54:29 +0200 Message-Id: <20210422065429.971789-1-daniel@dd-wrt.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2a05:a1c7:1:b101:4051:a36c:8d74:5be9 X-SA-Exim-Mail-From: daniel@dd-wrt.com Subject: [PATCH] package: openssl: Enable built engines per default X-SA-Exim-Version: 4.2.1 (built Thu, 26 May 2011 15:22:33 +0200) X-SA-Exim-Scanned: No (on webmail.newmedia-net.de); Unknown failure X-NMN-MailScanner-Information: Please contact the ISP for more information X-NMN-MailScanner-ID: 1lZTEP-0001Ax-4p X-NMN-MailScanner: Found to be clean X-NMN-MailScanner-From: daniel@dd-wrt.com X-Spam-Status: No X-Received: from [2a05:a1c7:1:b101:4051:a36c:8d74:5be9] (helo=lappi.newmedia-net.de) by webmail.newmedia-net.de with esmtpa (Exim 4.72) (envelope-from ) id 1lZTEP-0001Ax-4p; Thu, 22 Apr 2021 08:54:36 +0200 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210422_075440_654849_0A7DB923 X-CRM114-Status: UNSURE ( 5.37 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.2 (/) X-Spam-Report: Spam detection software, running on the system "desiato.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Automatically enable an engine in the openssl.cnf if it has been build. Before this change, /etc/openssl.cnf had to be edited manually on the system to enable the engine. Signed-off-by: Daniel Danzberger --- package/libs/openssl/Makefile | 7 +++++++ 1 file changed, 7 insertions(+) Content analysis details: (-0.2 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 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.34 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org Automatically enable an engine in the openssl.cnf if it has been build. Before this change, /etc/openssl.cnf had to be edited manually on the system to enable the engine. Signed-off-by: Daniel Danzberger --- package/libs/openssl/Makefile | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/libs/openssl/Makefile b/package/libs/openssl/Makefile index 7ab4c6ccd0..d101ee3aa2 100644 --- a/package/libs/openssl/Makefile +++ b/package/libs/openssl/Makefile @@ -375,9 +375,16 @@ define Package/libopenssl/install $(if $(CONFIG_OPENSSL_ENGINE),$(INSTALL_DIR) $(1)/usr/lib/$(ENGINES_DIR)) endef +define Package/libopenssl-conf/enable + $(if $(CONFIG_PACKAGE_libopenssl-$(2)),sed -i s/^\#*$(2)=$(2)/$(2)=$(2)/ $(1)/etc/ssl/openssl.cnf) +endef + define Package/libopenssl-conf/install $(INSTALL_DIR) $(1)/etc/ssl $(CP) $(PKG_INSTALL_DIR)/etc/ssl/openssl.cnf $(1)/etc/ssl/ + $(call Package/libopenssl-conf/enable,$(1),devcrypto) + $(call Package/libopenssl-conf/enable,$(1),afalg) + $(call Package/libopenssl-conf/enable,$(1),padlock) endef define Package/openssl-util/install