From patchwork Sun May 27 22:13:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rosen Penev X-Patchwork-Id: 921236 X-Patchwork-Delegate: blogic@openwrt.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.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; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="bOqMdQ93"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="smd01pCU"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40vDmY6PBCz9s0q for ; Mon, 28 May 2018 08:14:21 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:Subject:Message-Id:Date:To: From:Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=klNWKXz0bxh1xgbPUN+RhzbnFwwW7A/AwBqLNlY0Rt4=; b=bOqMdQ938vP6Eh iM/n3AGB8EF35ao0kzYO0zvbzD4kSfn8b0sMsLv0Ni2fffOFASHEqbTOyydvNDylvD+nLMPGn3+24 Ijh4Gser81SY+8QaloUVDHqQ2P4HyeGtHlDV2URIc6/GIAqWQY/MYjYqicL87ZWKsqSMjgjYKdRRE 6biyixUjwzJArMTsT6leiISQuPlLrrRQFN+QN/9P4lZbtHphZE0Qu6ZHkItSPzmDQqmMMMbWz/3Fy F3kdAs/TJtLTXnidUcLypOqbPI8tP8HQkBWUUb6FRnvzwoJNycOzp0yEQhbouRLheIaJF1zNykNYa VPh3SYMMd0jZ5FsuLbUw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fN3vR-0007PA-Dt; Sun, 27 May 2018 22:14:05 +0000 Received: from mail-pl0-x241.google.com ([2607:f8b0:400e:c01::241]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fN3vN-0007O3-VX for lede-dev@lists.infradead.org; Sun, 27 May 2018 22:14:03 +0000 Received: by mail-pl0-x241.google.com with SMTP id c41-v6so6055361plj.10 for ; Sun, 27 May 2018 15:13:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=diIjzo2a8rQpQolUcJ5XiiGE/4lfpjFVjL1dhCj/7QU=; b=smd01pCU7IyfWsGpeWfFLWJ8ipIJjnHfWm+/HvMG1rRErjHkKY5LAyV1ckl3c6OzSN ZU9sRxtTSKS/B2W9iqc0uQg+K5l82leDrGImnBVgpuiDFeRycIZv394T/KTzClubw4HM xbY1es4GnzzeysJYAQWXHvkC5Ydu38bcjIJMpFj6lQT9G0dz8yMmpcuB4ZJfKqY+Hf8y e8mxtQSg3WhtHGkSPsHjqijrkvCNVhf5s2Huah3XyEn9ydITpjHikwEHRIkQ//OygAOE w+oU65WQEY/093DWdqQxED0s24h7YNytHZ2i3aE0zT1r6zlZNYGW3hCOH7CoPF5vhB+m VM/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=diIjzo2a8rQpQolUcJ5XiiGE/4lfpjFVjL1dhCj/7QU=; b=VJe8j9Luxmo6zoaGacnlaMcEuLcwj73NgeJYWTckgx/gMLIr+WqdVq0xZSlHanPUWf 3EquFmm6dsH1AnsVo7cT1EHomTBng0Tw1AjBfkWr7am1YjYjT44jMt1msnyQYEmw1WRa JwrgEyQc+eFhsnuHZrgva2dvk7SUYoE9Hpq+SdHntbzHSO4AVSvlvEFRJN76+K9dmDI+ Yw3vC2PeWvxXZNMdkPnZUER/rkP6S0YSXSSfQbGVMs+QrJkOt9fsfdFUMAZpnDmxzjeU 4PhLY6YaVUmMiUu4vxUbW+CZlDnxoBtPIBLhdeVvRdOJgdgQIC6imCWAvlBLaztzQ1KA tmxA== X-Gm-Message-State: ALKqPwdkD87Nm9vFzEmOv3zKX0mZvO3HyUh7bZXAdavXkWecw9pav1C+ YnQbAn01S15anRol5emakkpsDG4n X-Google-Smtp-Source: AB8JxZruG5uQvmIK2g6q33fXb1+MAvH86hDQDLQd6BzQuhfvurFTsX5oKvnRnejNMJY4vXkxCFUw2A== X-Received: by 2002:a17:902:b786:: with SMTP id e6-v6mr11369283pls.260.1527459230914; Sun, 27 May 2018 15:13:50 -0700 (PDT) Received: from clevo-mangix.lan (astound-69-42-5-101.ca.astound.net. [69.42.5.101]) by smtp.gmail.com with ESMTPSA id p1-v6sm50343046pfp.137.2018.05.27.15.13.49 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 27 May 2018 15:13:50 -0700 (PDT) From: Rosen Penev To: openwrt-devel@lists.openwrt.org Date: Sun, 27 May 2018 15:13:47 -0700 Message-Id: <20180527221348.8716-1-rosenp@gmail.com> X-Mailer: git-send-email 2.17.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180527_151402_048009_34BDA17D X-CRM114-Status: GOOD ( 10.68 ) X-Spam-Score: 1.3 (+) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (1.3 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2607:f8b0:400e:c01:0:0:0:241 listed in] [list.dnswl.org] 0.0 DKIM_ADSP_CUSTOM_MED No valid author signature, adsp_override is CUSTOM_MED -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (rosenp[at]gmail.com) 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid 0.0 T_DKIM_INVALID DKIM-Signature header exists but is not valid 1.2 NML_ADSP_CUSTOM_MED ADSP custom_med hit, and not from a mailing list Subject: [OpenWrt-Devel] [PATCH 1/2] curl: Use ca-bundle for all TLS libraries. X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org It simplifies the Makefile a bit. In addition, using ca-bundle saves some space as well. It also fixes an issue with at least transmission, which has a dependency on ca-bundle, but currently libcurl with OpenSSL or GnuTLS cause it not to work. This has been tested on mt7621 with OpenSSL and GnuTLS just by running 'curl https://www.google.com' and seeing if there's a verify error. The rest are already using ca-bundle and therefore work fine. Signed-off-by: Rosen Penev Tested-by: Kevin Darbyshire-Bryant --- package/network/utils/curl/Makefile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/package/network/utils/curl/Makefile b/package/network/utils/curl/Makefile index 92b3cab7dd..ae8cc31edc 100644 --- a/package/network/utils/curl/Makefile +++ b/package/network/utils/curl/Makefile @@ -112,13 +112,15 @@ CONFIGURE_ARGS += \ --without-libmetalink \ --without-librtmp \ --without-libidn \ + --without-ca-path \ + --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt \ \ $(call autoconf_bool,CONFIG_IPV6,ipv6) \ \ - $(if $(CONFIG_LIBCURL_WOLFSSL),--with-cyassl="$(STAGING_DIR)/usr" --without-ca-path --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt,--without-cyassl) \ - $(if $(CONFIG_LIBCURL_GNUTLS),--with-gnutls="$(STAGING_DIR)/usr" --without-ca-bundle --with-ca-path=/etc/ssl/certs,--without-gnutls) \ - $(if $(CONFIG_LIBCURL_OPENSSL),--with-ssl="$(STAGING_DIR)/usr" --without-ca-bundle --with-ca-path=/etc/ssl/certs,--without-ssl) \ - $(if $(CONFIG_LIBCURL_MBEDTLS),--with-mbedtls="$(STAGING_DIR)/usr" --without-ca-path --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt,--without-mbedtls) \ + $(if $(CONFIG_LIBCURL_WOLFSSL),--with-cyassl="$(STAGING_DIR)/usr",--without-cyassl) \ + $(if $(CONFIG_LIBCURL_GNUTLS),--with-gnutls="$(STAGING_DIR)/usr",--without-gnutls) \ + $(if $(CONFIG_LIBCURL_OPENSSL),--with-ssl="$(STAGING_DIR)/usr",--without-ssl) \ + $(if $(CONFIG_LIBCURL_MBEDTLS),--with-mbedtls="$(STAGING_DIR)/usr",--without-mbedtls) \ \ $(if $(CONFIG_LIBCURL_LIBIDN2),--with-libidn2="$(STAGING_DIR)/usr",--without-libidn2) \ $(if $(CONFIG_LIBCURL_SSH2),--with-libssh2="$(STAGING_DIR)/usr",--without-libssh2) \ From patchwork Sun May 27 22:13:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rosen Penev X-Patchwork-Id: 921237 X-Patchwork-Delegate: blogic@openwrt.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.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; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="nvHGLRmw"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="DJygWJFR"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40vDmn2v2Fz9s0q for ; Mon, 28 May 2018 08:14:33 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:Subject:References: In-Reply-To:Message-Id:Date:To:From:Reply-To:Cc:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=p1OILPe33hC6ozkCtnekV/WRiWN5Jr9jQVua9sColNo=; b=nvHGLRmwbOt6mzIHV3Ku3rs9jw PQVJk3x/z5MODyeYfezNVuqSo+DT+BIWkAXFWfZ0PoqZMd8nOxT8c4DsqRG+9n2T6hbHGRikAqlEu aANM1fTryufybYhHhTWrSKtFv7UC/ReZ1JALprQa0oy15DQIuBkEcKg5MG8MmXD4hMufr+EF9kSN6 bySPp6O0l0jgeYTg2li0V2dMPsyt8Z6vT4wfraFAicgjC7H6FClWHTdzsUMYjVn9I/asv1aDiHmOs Kjl8nRbceBRmQX5sXzbFoPHfVzybxCZFxl4tMBJUBDxKz/yAG0YtCuXDBcTSLFkaSXO/ayzOYELvs srWR3lrg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fN3vl-0007ZO-L3; Sun, 27 May 2018 22:14:25 +0000 Received: from mail-pl0-x241.google.com ([2607:f8b0:400e:c01::241]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fN3vN-0007O5-Vb for lede-dev@lists.infradead.org; Sun, 27 May 2018 22:14:03 +0000 Received: by mail-pl0-x241.google.com with SMTP id z9-v6so2715402plk.11 for ; Sun, 27 May 2018 15:13:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=ZFr939z01d6QFQHF5ZZZOKWq/4RcwB8osTQWpQ0UaDw=; b=DJygWJFRMXVFX9PZzpSxzF6oPL69PB7w16pdLOwE+sEGuLxg+A03jcmE45XCGAXqby 3hlzTk1X2HaKjTMYr2rtRKebgOZkhLH/V9LoDY2XX8Okaip77/XaDGGzZbAHxtB73H/w z2FykP1AOCNfWj/zCuGMFrHM7+6RnDKq0xYpSPfFXHyzVN0d8KyBhQIJ7zCa2P9FHZzz CjB6DS7Qx1RAaVM+YTe94k+3lW54O1700+E0f5jXKxGtg+L67esnCWxVGSNJzdZdak4B voYKifK7i0rd9dSGzkVec4bsDF7gihd77jFRb9iFQDgR4HPtkTQEAKiBeMKwa+V+oHa9 Ubpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=ZFr939z01d6QFQHF5ZZZOKWq/4RcwB8osTQWpQ0UaDw=; b=RYETPVUGVyBVdKjVWPWjXlKkDx5YC+Wa6UdJgY7ocK2Jl39nl2gpBcoQtA6ZwZTipb cxg2A4WO6hLDp9iEWOvN6O+jj/zqXEmIMd4rCsYqzSQYR+ovaEe1Edvn6h0U0Fs8aUD5 oAe3WyHJp7iE90gH2GSxklWCVTU6zqs0tPLFp6bhTA5lidIo5JgG8BdQpNd/F/LqBTR9 lxKcgYPYg6u3V6LDC0xux2KmO1t8yOU3ZKiF9TWYWX2x9nhkVR+FmbsnbW/vwNUpfqIA F0/u40WfctUqTnPyUGyh2GSaLKMWFjcCF82H5ikMqDuco2p3eEn8MWSW4orNLhTSfgCy jIjw== X-Gm-Message-State: ALKqPwc7UcdmBKYOOlKJnVfQHOMjMX2Ad8JKsNlCKcHSBQf7k5C0IHS2 pOBgODoStkgMvbbBpS7mEzmiwsTq X-Google-Smtp-Source: AB8JxZoSs8AAqyBNJ2/h2YkPlYgooBzE/VRhFePzqXhgV/evqyi/GcqYGjIEOMHvv6yhTVG1mxorlQ== X-Received: by 2002:a17:902:74c8:: with SMTP id f8-v6mr11374548plt.317.1527459231653; Sun, 27 May 2018 15:13:51 -0700 (PDT) Received: from clevo-mangix.lan (astound-69-42-5-101.ca.astound.net. [69.42.5.101]) by smtp.gmail.com with ESMTPSA id p1-v6sm50343046pfp.137.2018.05.27.15.13.50 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 27 May 2018 15:13:51 -0700 (PDT) From: Rosen Penev To: openwrt-devel@lists.openwrt.org Date: Sun, 27 May 2018 15:13:48 -0700 Message-Id: <20180527221348.8716-2-rosenp@gmail.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180527221348.8716-1-rosenp@gmail.com> References: <20180527221348.8716-1-rosenp@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180527_151402_050863_52C57025 X-CRM114-Status: GOOD ( 10.47 ) X-Spam-Score: 1.3 (+) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (1.3 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2607:f8b0:400e:c01:0:0:0:241 listed in] [list.dnswl.org] 0.0 DKIM_ADSP_CUSTOM_MED No valid author signature, adsp_override is CUSTOM_MED -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (rosenp[at]gmail.com) 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid 0.0 T_DKIM_INVALID DKIM-Signature header exists but is not valid 1.2 NML_ADSP_CUSTOM_MED ADSP custom_med hit, and not from a mailing list Subject: [OpenWrt-Devel] [PATCH 2/2] curl: Add ca-bundle dependency X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org While building, curl complains that the path specified is missing. Also, without ca-bundle, something like 'curl https://www.google.com' does not work due to a certificate verify error. Signed-off-by: Rosen Penev --- package/network/utils/curl/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/network/utils/curl/Makefile b/package/network/utils/curl/Makefile index ae8cc31edc..b4e3fd9d99 100644 --- a/package/network/utils/curl/Makefile +++ b/package/network/utils/curl/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=curl PKG_VERSION:=7.60.0 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://dl.uxnr.de/mirror/curl/ \ @@ -88,7 +88,7 @@ define Package/libcurl CATEGORY:=Libraries DEPENDS:= +LIBCURL_WOLFSSL:libwolfssl +LIBCURL_OPENSSL:libopenssl +LIBCURL_GNUTLS:libgnutls +LIBCURL_MBEDTLS:libmbedtls DEPENDS += +LIBCURL_ZLIB:zlib +LIBCURL_THREADED_RESOLVER:libpthread +LIBCURL_LDAP:libopenldap +LIBCURL_LIBIDN2:libidn2 - DEPENDS += +LIBCURL_SSH2:libssh2 +LIBCURL_NGHTTP2:libnghttp2 + DEPENDS += +LIBCURL_SSH2:libssh2 +LIBCURL_NGHTTP2:libnghttp2 +ca-bundle TITLE:=A client-side URL transfer library MENU:=1 endef