summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Korsgaard <peter@korsgaard.com>2017-11-05 22:34:02 +0100
committerPeter Korsgaard <peter@korsgaard.com>2017-11-06 18:43:54 +0100
commitd9a521f00886e4c9082bd998f267b4bafcfe2b17 (patch)
tree5891b69f5d3349704c4a7f18e68b2cc5ee35ae01
parent0c219ddb8ac2736057402144825b22812b5a642c (diff)
downloadbuildroot-d9a521f00886e4c9082bd998f267b4bafcfe2b17.tar.gz
buildroot-d9a521f00886e4c9082bd998f267b4bafcfe2b17.zip
libssh2: revert to previous crypto defaults
The recent crypto handling change (commit 04a1031d3: package/libssh2: Add selectable crypto libraries) had the unfortunate side effect that it no longer automatically selects the most suitable crypto backend (E.G. one where the dependency is already enabled), so all users not wanting to use the mbedtls backend need to explicitly configure this. Fix this by inverting the logic so the crypto backend sub options use 'depends on' their dependencies instead of 'select', so only the available backends are displayed. Like before, default to openssl if no crypto backend dependencies are currently enabled. Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--package/libssh2/Config.in8
1 files changed, 4 insertions, 4 deletions
diff --git a/package/libssh2/Config.in b/package/libssh2/Config.in
index f2d32a90ae..90c38813b3 100644
--- a/package/libssh2/Config.in
+++ b/package/libssh2/Config.in
@@ -1,5 +1,6 @@
config BR2_PACKAGE_LIBSSH2
bool "libssh2"
+ select BR2_PACKAGE_OPENSSL if !(BR2_PACKAGE_MBEDTLS || BR2_PACKAGE_LIBGCRYPT)
help
libssh2 is a client-side C library implementing the SSH2
protocol as defined by Internet Drafts: SECSH-TRANS(22),
@@ -17,16 +18,15 @@ choice
config BR2_PACKAGE_LIBSSH2_MBEDTLS
bool "mbedtls"
- select BR2_PACKAGE_MBEDTLS
+ depends on BR2_PACKAGE_MBEDTLS
config BR2_PACKAGE_LIBSSH2_LIBGCRYPT
bool "gcrypt"
- depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt -> libgpg-error
- select BR2_PACKAGE_LIBGCRYPT
+ depends on BR2_PACKAGE_LIBGCRYPT
config BR2_PACKAGE_LIBSSH2_OPENSSL
bool "openssl"
- select BR2_PACKAGE_OPENSSL
+ depends on BR2_PACKAGE_OPENSSL
endchoice
endif
OpenPOWER on IntegriCloud