From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 16 Jun 2021 12:39:05 +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 1ltSwr-0005Za-Pa for lore@lore.pengutronix.de; Wed, 16 Jun 2021 12:39:05 +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 1ltSwr-0002XP-5w; Wed, 16 Jun 2021 12:39:05 +0200 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1ltStj-0007lS-6X; Wed, 16 Jun 2021 12:35:51 +0200 Received: from [2a0a:edc0:0:1101:1d::39] (helo=dude03.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1ltSti-00022H-Fa; Wed, 16 Jun 2021 12:35:50 +0200 Received: from mol by dude03.red.stw.pengutronix.de with local (Exim 4.92) (envelope-from ) id 1ltSti-008OUr-CO; Wed, 16 Jun 2021 12:35:50 +0200 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Wed, 16 Jun 2021 12:35:50 +0200 Message-Id: <20210616103550.2000734-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210608155329.14346-1-bst@pengutronix.de> References: <20210608155329.14346-1-bst@pengutronix.de> MIME-Version: 1.0 Subject: Re: [ptxdist] [APPLIED] 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 Thanks, applied as 21e4d71d3c932449e6bebd5c5fc29077b8ac9d86. Michael [sent from post-receive hook] On Wed, 16 Jun 2021 12:35:49 +0200, Bastian Krause wrote: > Signed-off-by: Bastian Krause > Message-Id: <20210608155329.14346-1-bst@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/libcurl.in b/rules/libcurl.in > index 390e495cac3b..632ed48e47ca 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 5620ba2767e7..7a915dce32f7 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 \ _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de