From patchwork Tue Dec 31 16:40:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 1216785 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=free.fr Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="E89saoZW"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47nKmN2jPTz9sPV for ; Wed, 1 Jan 2020 03:40:36 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id BFEF18496E; Tue, 31 Dec 2019 16:40:33 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id efJ0F4LzlItP; Tue, 31 Dec 2019 16:40:32 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id EBCA7847BE; Tue, 31 Dec 2019 16:40:31 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 1080D1BF41E for ; Tue, 31 Dec 2019 16:40:30 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 0D6D3847BE for ; Tue, 31 Dec 2019 16:40:30 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id li+0ugAf11hS for ; Tue, 31 Dec 2019 16:40:29 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by whitealder.osuosl.org (Postfix) with ESMTPS id 477BA841D5 for ; Tue, 31 Dec 2019 16:40:29 +0000 (UTC) Received: by mail-wm1-f67.google.com with SMTP id c127so2063692wme.1 for ; Tue, 31 Dec 2019 08:40:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=yhGsfWK1DFpg2dOtVusiRyWqcaMgEHgGeckJFcUtHr8=; b=E89saoZWmGBsKOB5DSNaY+eABi+bsmIUn5NWxQlLNZ368BbYGOJGKQP6EoCBjLwElP VX5DUilXLN+1Hp7XZwHDBdsQH+GyoQMrFQN5RTVVlz6sg9dqB/RfQQlJhsulFGtBQF2J eCTR3ZSWsWaqISrPTnk8HDwBNUnnrRBnKfhce2EY1hGsljJVxsXCumTZcROp7jUL+Lvt X1FwpTBqoCef/gDIctkh6q+8MUzXe/VYoJhIZ0KUiE1O9A7Fgc6DT7ysQRUULqBahK1I 9MegQrgM+ZhlUTbnuKmeHulKkUhO+F/y1ZGrfasyjVDYoj7d+y9lZHzvBbG52FC6sE7s D1HQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=yhGsfWK1DFpg2dOtVusiRyWqcaMgEHgGeckJFcUtHr8=; b=mZ0ivW7+1Gtz4RKPoIjOtSC0D4/Gi/sKU4siEEuvsjnk199VT6oq+GbhfgxjF97bZB BjVlhgTVTezc3elj8vvPiSwaS/GW2www47kYqE6pAAMqEFP3GD5AZK4PUZFE2RMw5Bta QwWa4fmTTMQUpOEzKIn0ePLz3TiDxlZg7hsnYMJqvODnJiEwt8ej6ZEC5ew5Ds3479WJ ot/7i+fUywbA0NTzugWYEiWzGs/+mzhOnPl8Xk2125NdopN+6V7tTeXskDk5t4HnCIlu wPJ71vjH1MuH+RNnInJNTBRijI2HniR+uWmS/y08TU65OzfNnmQyMh+bf5QL7J7M7wQT 4pzg== X-Gm-Message-State: APjAAAVZlfHajGds47YeNR9LMBSbqnsb0xVm1Jd19jzs4smVNb1Mvg8U eCtmyFkcA7yvV61gw3NoDU4YXhL/ X-Google-Smtp-Source: APXvYqyXafMdBqALbHQbc+XgRBTd6sNmq9StoE2Cia/F8JnB1ahlcP0N14d5M7VGrBbN6Reu8LpB0A== X-Received: by 2002:a05:600c:244:: with SMTP id 4mr4926845wmj.40.1577810427479; Tue, 31 Dec 2019 08:40:27 -0800 (PST) Received: from scaer.home ([2a01:cb19:8b51:cb00:64bb:2e69:4044:a9b6]) by smtp.gmail.com with ESMTPSA id e16sm48856105wrs.73.2019.12.31.08.40.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Dec 2019 08:40:26 -0800 (PST) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Tue, 31 Dec 2019 17:40:23 +0100 Message-Id: <20191231164023.10258-1-yann.morin.1998@free.fr> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH] package/libcurl: add option for no SSL/TLS support X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Yann E. MORIN" , Julien Grossholtz Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Since we already have a choice to select the backend to do crypto, push the limits even further and add an option to do no crypto. Usually, we would have added that option first in the choice, but if we were to do that now, existing defconfigs that previously used openssl (the first item in the choice) would now default to non crypto, which is not so nice. So we add the new option last in the choice. Each crypto backend option is used in a conditional block, each of which default to disabling said backend. So, selecting none will indeed disable all. We can now drop the blind intermediate option that would hide the choice when no backend library was available; there will now always be at least the none option in the choice, so we need not hide it. Signed-off-by: Yann E. MORIN Cc: Baruch Siach Cc: Matt Weber Cc: Julien Grossholtz --- package/libcurl/Config.in | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/package/libcurl/Config.in b/package/libcurl/Config.in index 3a9ee0f121..652285c0f8 100644 --- a/package/libcurl/Config.in +++ b/package/libcurl/Config.in @@ -45,17 +45,8 @@ config BR2_PACKAGE_LIBCURL_EXTRA_PROTOCOLS_FEATURES - DICT - Gopher -config BR2_PACKAGE_LIBCURL_TLS_SUPPORT - bool - default y if BR2_PACKAGE_OPENSSL - default y if BR2_PACKAGE_GNUTLS - default y if BR2_PACKAGE_LIBNSS - default y if BR2_PACKAGE_MBEDTLS - default y if BR2_PACKAGE_WOLFSSL - choice prompt "SSL/TLS library to use" - depends on BR2_PACKAGE_LIBCURL_TLS_SUPPORT config BR2_PACKAGE_LIBCURL_OPENSSL bool "OpenSSL" @@ -77,9 +68,9 @@ config BR2_PACKAGE_LIBCURL_WOLFSSL bool "WolfSSL" depends on BR2_PACKAGE_WOLFSSL +config BR2_PACKAGE_LIBCURL_TLS_NONE + bool "None" + endchoice -comment "A TLS library is needed for SSL/TLS support" - depends on !BR2_PACKAGE_LIBCURL_TLS_SUPPORT - endif