From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 08 Jun 2021 17:54:28 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1lqe3g-0000ML-RU for lore@lore.pengutronix.de; Tue, 08 Jun 2021 17:54:28 +0200 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1lqe3g-0008Ms-Iy; Tue, 08 Jun 2021 17:54:28 +0200 Received: from dude.hi.pengutronix.de ([2001:67c:670:100:1d::7] helo=dude.pengutronix.de.) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1lqe2l-0008BF-5S; Tue, 08 Jun 2021 17:53:31 +0200 From: Bastian Krause To: ptxdist@pengutronix.de Date: Tue, 8 Jun 2021 17:53:28 +0200 Message-Id: <20210608155329.14346-1-bst@pengutronix.de> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Subject: [ptxdist] [PATCH 1/2] libcurl: allow choice between OpenSSL and GnuTLS backend X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Bastian Krause Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false Signed-off-by: Bastian Krause --- rules/libcurl.in | 20 +++++++++++++++++++- rules/libcurl.make | 6 +++--- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/rules/libcurl.in b/rules/libcurl.in index 390e495ca..632ed48e4 100644 --- a/rules/libcurl.in +++ b/rules/libcurl.in @@ -5,7 +5,8 @@ menuconfig LIBCURL prompt "libcurl " select LIBC_RT select ZLIB - select OPENSSL if LIBCURL_SSL + select OPENSSL if LIBCURL_SSL_OPENSSL + select GNUTLS if LIBCURL_SSL_GNUTLS select LIBSSH2 if LIBCURL_LIBSSH2 select CA_CERTIFICATES if LIBCURL_SSL_CA_CERTIFICATES && RUNTIME select C_ARES if LIBCURL_C_ARES @@ -58,6 +59,17 @@ config LIBCURL_SSL if LIBCURL_SSL +choice + prompt "SSL backend" + default LIBCURL_SSL_OPENSSL + + config LIBCURL_SSL_OPENSSL + bool "OpenSSL" + + config LIBCURL_SSL_GNUTLS + bool "GnuTLS" +endchoice + choice prompt "Central CA certificate storage" @@ -81,6 +93,12 @@ config LIBCURL_SSL_CA_CERTIFICATES_PATH endif +config LIBCURL_SSL_DEFAULT_BACKEND + string + default "openssl" if LIBCURL_SSL_OPENSSL + default "gnutls" if LIBCURL_SSL_GNUTLS + default "no" if !LIBCURL_SSL + config LIBCURL_SSL_CAPATH_PATH string "CA directory path" if LIBCURL_SSL_CAPATH default "/etc/ssl/certs" if LIBCURL_SSL_CAPATH || (LIBCURL_SSL_CA_CERTIFICATES && LIBCURL_SSL_CA_CERTIFICATES_PATH) diff --git a/rules/libcurl.make b/rules/libcurl.make index 5620ba276..7a915dce3 100644 --- a/rules/libcurl.make +++ b/rules/libcurl.make @@ -89,15 +89,15 @@ LIBCURL_CONF_OPT := \ --without-brotli \ --without-zstd \ --without-gssapi \ - --with-default-ssl-backend=$(call ptx/ifdef, PTXCONF_LIBCURL_SSL,openssl,no) \ + --with-default-ssl-backend=$(PTXCONF_LIBCURL_SSL_DEFAULT_BACKEND) \ --without-winssl \ --without-schannel \ --without-darwinssl \ --without-secure-transport \ --without-amissl \ - --with-ssl=$(call ptx/ifdef, PTXCONF_LIBCURL_SSL,$(SYSROOT)/usr,no) \ + --with-ssl=$(call ptx/ifdef, PTXCONF_LIBCURL_SSL_OPENSSL,$(SYSROOT)/usr,no) \ --with-random=/dev/urandom \ - --without-gnutls \ + --with-gnutls=$(call ptx/ifdef, PTXCONF_LIBCURL_SSL_GNUTLS,$(SYSROOT)/usr,no) \ --without-mbedtls \ --without-wolfssl \ --without-mesalink \ -- 2.29.2 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de