diff options
author | Michael Olbrich <m.olbrich@pengutronix.de> | 2015-04-23 18:58:38 +0200 |
---|---|---|
committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2015-04-27 10:38:37 +0200 |
commit | 1faa58d0e0f432fa9adf2cc48f543b70ecdb5fe8 (patch) | |
tree | c173258e12f31c35d40a58d758f2aa542959610b /rules/libcurl.in | |
parent | 0ab04511fb043cb15e179cb307f904d4bfb8b579 (diff) | |
download | ptxdist-1faa58d0e0f432fa9adf2cc48f543b70ecdb5fe8.tar.gz ptxdist-1faa58d0e0f432fa9adf2cc48f543b70ecdb5fe8.tar.xz |
libcurl: cleanup and improve CA
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/libcurl.in')
-rw-r--r-- | rules/libcurl.in | 35 |
1 files changed, 22 insertions, 13 deletions
diff --git a/rules/libcurl.in b/rules/libcurl.in index bdb0ad5a9..c832153af 100644 --- a/rules/libcurl.in +++ b/rules/libcurl.in @@ -5,8 +5,9 @@ menuconfig LIBCURL prompt "libcurl " select LIBC_RT select ZLIB - select OPENSSL if LIBCURL_SSL - select LIBSSH2 if LIBCURL_LIBSSH2 + select OPENSSL if LIBCURL_SSL + select LIBSSH2 if LIBCURL_LIBSSH2 + select CA_CERTIFICATES if LIBCURL_SSL_CA_CERTIFICATES && RUNTIME help curl is a command line tool for transferring files with URL syntax, supporting FTP, FTPS, HTTP, HTTPS, SCP, SFTP, TFTP, TELNET, DICT, LDAP, LDAPS and FILE. @@ -47,26 +48,34 @@ choice prompt "Central CA certificate storage" config LIBCURL_SSL_NOCA - bool "No CA storage" + bool "No CA storage " config LIBCURL_SSL_CAPATH - bool "CA directory" + bool "custom CA directory" config LIBCURL_SSL_CABUNDLE - bool "CA bundle" + bool "custom CA bundle " + + config LIBCURL_SSL_CA_CERTIFICATES + bool "use ca-certificates" endchoice +config LIBCURL_SSL_CA_CERTIFICATES_PATH + bool + depends on LIBCURL_SSL_CA_CERTIFICATES + default CA_CERTIFICATES_CERTS + +endif + config LIBCURL_SSL_CAPATH_PATH - string "CA directory path" - depends on LIBCURL_SSL_CAPATH - default "/etc/ssl/certs" + 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) + default "no" config LIBCURL_SSL_CABUNDLE_PATH - string "CA bundle path" - depends on LIBCURL_SSL_CABUNDLE - default "/etc/ssl/certs/ca-certificates.crt" - -endif + string "CA bundle path" if LIBCURL_SSL_CABUNDLE + default "/etc/ssl/certs/ca-certificates.crt" if LIBCURL_SSL_CABUNDLE || (LIBCURL_SSL_CA_CERTIFICATES && !LIBCURL_SSL_CA_CERTIFICATES_PATH) + default "no" config LIBCURL_CRYPTO_AUTH bool "cryptographic authentication" |