eessppeelllloo/cryptsetup
1
0
Fork 0
mirror of https://gitlab.com/cryptsetup/cryptsetup.git synced 2025-12-12 03:10:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Support build with older libssh.

Browse Source 
The function ssh_session_is_known_server() was introduced later,
fallback to older version if libssh is available.
This commit is contained in:
Milan Broz
2021-07-25 21:56:37 +02:00
parent 5d1972bb97
commit 508284cd28
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
configure.ac
View File

@@ -402,6 +402,7 @@ AC_CHECK_DECLS([json_object_deep_copy], [], [], [#include <json-c/json.h>])
dnl Check for libssh for SSH plugin dnl Check for libssh for SSH plugin
if test "x$enable_ssh_token" = "xyes"; then if test "x$enable_ssh_token" = "xyes"; then
PKG_CHECK_MODULES([LIBSSH], [libssh]) PKG_CHECK_MODULES([LIBSSH], [libssh])
AC_CHECK_DECLS([ssh_session_is_known_server], [], [], [#include <libssh/libssh.h>])
fi fi
dnl Crypto backend configuration. dnl Crypto backend configuration.

4
tokens/ssh/ssh-utils.c
View File

@@ -123,7 +123,11 @@ ssh_session sshplugin_session_init(struct crypt_device *cd, const char *host, co
goto out; goto out;
} }
#if HAVE_DECL_SSH_SESSION_IS_KNOWN_SERVER
r = ssh_session_is_known_server(ssh); r = ssh_session_is_known_server(ssh);
#else
r = ssh_is_server_known(ssh);
#endif
if (r != SSH_SERVER_KNOWN_OK) { if (r != SSH_SERVER_KNOWN_OK) {
crypt_log(cd, CRYPT_LOG_ERROR, _("Server not known: ")); crypt_log(cd, CRYPT_LOG_ERROR, _("Server not known: "));
r = SSH_AUTH_ERROR; r = SSH_AUTH_ERROR;