From: Baruch Siach Date: Mon, 10 Jul 2017 17:35:54 +0000 (+0300) Subject: libssh2: add mbedtls backend X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=714df4cfed026cee2949131062e499b6c0fadd5d;p=buildroot.git libssh2: add mbedtls backend libssh2 support mbedtls as crypto back-end library since version 1.8.0. Default to mbedtls since it's smaller than either libgcrypt or openssl. Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- diff --git a/package/libssh2/Config.in b/package/libssh2/Config.in index 2944624e0a..9b60823e7a 100644 --- a/package/libssh2/Config.in +++ b/package/libssh2/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_LIBSSH2 bool "libssh2" - select BR2_PACKAGE_OPENSSL if !BR2_PACKAGE_LIBGCRYPT + 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), diff --git a/package/libssh2/libssh2.mk b/package/libssh2/libssh2.mk index c658282349..338f5b458f 100644 --- a/package/libssh2/libssh2.mk +++ b/package/libssh2/libssh2.mk @@ -11,12 +11,16 @@ LIBSSH2_LICENSE_FILES = COPYING LIBSSH2_INSTALL_STAGING = YES LIBSSH2_CONF_OPTS = --disable-examples-build -# Dependency is either on libgcrypt or openssl, guaranteed in Config.in. -# Favour libgcrypt. -ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) +# Dependency is one of mbedtls, libgcrypt or openssl, guaranteed in +# Config.in. Favour mbedtls. +ifeq ($(BR2_PACKAGE_MBEDTLS),y) +LIBSSH2_DEPENDENCIES += mbedtls +LIBSSH2_CONF_OPTS += --with-mbedtls=$(STAGING_DIR)/usr \ + --without-openssl --without-libgcrypt +else ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) LIBSSH2_DEPENDENCIES += libgcrypt LIBSSH2_CONF_OPTS += --with-libgcrypt=$(STAGING_DIR)/usr \ - --without-openssl + --without-openssl --without-mbedtls # configure.ac forgets to link to dependent libraries of gcrypt breaking static # linking LIBSSH2_CONF_ENV += LIBS="`$(STAGING_DIR)/usr/bin/libgcrypt-config --libs`" @@ -24,7 +28,7 @@ else LIBSSH2_DEPENDENCIES += openssl LIBSSH2_CONF_OPTS += --with-openssl \ --with-libssl-prefix=$(STAGING_DIR)/usr \ - --without-libgcrypt + --without-libgcrypt --without-mbedtls endif # Add zlib support if enabled