[Buildroot] [git commit] package/libcurl: add option for no SSL/TLS support

Thomas Petazzoni thomas.petazzoni at bootlin.com
Tue Dec 31 17:11:45 UTC 2019


commit: https://git.buildroot.net/buildroot/commit/?id=4fea071c61717bb7e248ff42bf9894d31cab1255
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master

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 <yann.morin.1998 at free.fr>
Cc: Baruch Siach <baruch at tkos.co.il>
Cc: Matt Weber <matthew.weber at rockwellcollins.com>
Cc: Julien Grossholtz <julien.grossholtz at openest.io>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni at bootlin.com>
---
 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
 
-endchoice
+config BR2_PACKAGE_LIBCURL_TLS_NONE
+	bool "None"
 
-comment "A TLS library is needed for SSL/TLS support"
-	depends on !BR2_PACKAGE_LIBCURL_TLS_SUPPORT
+endchoice
 
 endif


More information about the buildroot mailing list