SFTP: compatibility with older libssh versions

Signed-off-by: Mavridis Philippe <[email protected]>
Signed-off-by: Slávek Banko <[email protected]>
(cherry picked from commit d6db1a583cc495ae318872e298f200ee1da673d9)

2 files changed, 40 insertions, 6 deletions

diff --git a/tdeioslave/sftp/tdeio_sftp.cpp b/tdeioslave/sftp/tdeio_sftp.cpp
index efdfa3e45..d62e7e062 100644
--- a/tdeioslave/sftp/tdeio_sftp.cpp
+++ b/tdeioslave/sftp/tdeio_sftp.cpp
@@ -643,14 +643,22 @@ void sftpProtocol::openConnection() {
 
   /* get the hash */
   ssh_key serverKey;
+#if LIBSSH_VERSION_INT < SSH_VERSION_INT(0, 7, 90)
+  if (ssh_get_publickey(mSession, &serverKey) < 0) {
+#else
   if (ssh_get_server_publickey(mSession, &serverKey) < 0) {
+#endif
     error(TDEIO::ERR_COULD_NOT_CONNECT, TQString::fromUtf8(ssh_get_error(mSession)));
     closeConnection();
     return;
   }
 
   size_t hlen;
+#if LIBSSH_VERSION_INT < SSH_VERSION_INT(0, 8, 90)
+  if (ssh_get_publickey_hash(serverKey, SSH_PUBLICKEY_HASH_MD5, &hash, &hlen) < 0) {
+#else
   if (ssh_get_publickey_hash(serverKey, SSH_PUBLICKEY_HASH_SHA256, &hash, &hlen) < 0) {
+#endif
     error(TDEIO::ERR_COULD_NOT_CONNECT, TQString::fromUtf8(ssh_get_error(mSession)));
     closeConnection();
     return;
@@ -659,11 +667,15 @@ void sftpProtocol::openConnection() {
   kdDebug(TDEIO_SFTP_DB) << "Checking if the SSH server is known" << endl;
 
   /* check the server public key hash */
+#if LIBSSH_VERSION_INT < SSH_VERSION_INT(0, 7, 90)
+  state = ssh_is_server_known(mSession);
+#else
   state = ssh_session_is_known_server(mSession);
+#endif
   switch (state) {
-    case SSH_KNOWN_HOSTS_OK:
+    case TDEIO_SSH_KNOWN_HOSTS_OK:
       break;
-    case SSH_KNOWN_HOSTS_OTHER:
+    case TDEIO_SSH_KNOWN_HOSTS_OTHER:
       delete hash;
       error(TDEIO::ERR_CONNECTION_BROKEN, i18n("The host key for this server was "
             "not found, but another type of key exists.\n"
@@ -672,7 +684,7 @@ void sftpProtocol::openConnection() {
             "Please contact your system administrator.\n%1").arg(TQString::fromUtf8(ssh_get_error(mSession))));
       closeConnection();
       return;
-    case SSH_SERVER_KNOWN_CHANGED:
+    case TDEIO_SSH_KNOWN_HOSTS_CHANGED:
       hexa = ssh_get_hexa(hash, hlen);
       delete hash;
       /* TODO print known_hosts file, port? */
@@ -685,8 +697,8 @@ void sftpProtocol::openConnection() {
       delete hexa;
       closeConnection();
       return;
-    case SSH_KNOWN_HOSTS_NOT_FOUND:
-    case SSH_KNOWN_HOSTS_UNKNOWN:
+    case TDEIO_SSH_KNOWN_HOSTS_NOT_FOUND:
+    case TDEIO_SSH_KNOWN_HOSTS_UNKNOWN:
       hexa = ssh_get_hexa(hash, hlen);
       delete hash;
       caption = i18n("Warning: Cannot verify host's identity.");
@@ -703,13 +715,17 @@ void sftpProtocol::openConnection() {
 
       /* write the known_hosts file */
       kdDebug(TDEIO_SFTP_DB) << "Adding server to known_hosts file." << endl;
+#if LIBSSH_VERSION_INT < SSH_VERSION_INT(0, 7, 90)
+      if (ssh_write_knownhost(mSession) != SSH_OK) {
+#else
       if (ssh_session_update_known_hosts(mSession) != SSH_OK) {
+#endif
         error(TDEIO::ERR_USER_CANCELED, TQString::fromUtf8(ssh_get_error(mSession)));
         closeConnection();
         return;
       }
       break;
-    case SSH_KNOWN_HOSTS_ERROR:
+    case TDEIO_SSH_KNOWN_HOSTS_ERROR:
       delete hash;
       error(TDEIO::ERR_COULD_NOT_CONNECT, TQString::fromUtf8(ssh_get_error(mSession)));
       return;
diff --git a/tdeioslave/sftp/tdeio_sftp.h b/tdeioslave/sftp/tdeio_sftp.h
index 82bbc7a43..8e46d815c 100644
--- a/tdeioslave/sftp/tdeio_sftp.h
+++ b/tdeioslave/sftp/tdeio_sftp.h
@@ -41,6 +41,24 @@
 #define MAX_XFER_BUF_SIZE 60 * 1024
 #define TDEIO_SFTP_DB 7120
 
+
+#if LIBSSH_VERSION_INT < SSH_VERSION_INT(0, 7, 90)
+#define TDEIO_SSH_KNOWN_HOSTS_OK        SSH_SERVER_KNOWN_OK
+#define TDEIO_SSH_KNOWN_HOSTS_OTHER     SSH_SERVER_FOUND_OTHER
+#define TDEIO_SSH_KNOWN_HOSTS_CHANGED   SSH_SERVER_KNOWN_CHANGED
+#define TDEIO_SSH_KNOWN_HOSTS_NOT_FOUND SSH_SERVER_FILE_NOT_FOUND
+#define TDEIO_SSH_KNOWN_HOSTS_UNKNOWN   SSH_SERVER_NOT_KNOWN
+#define TDEIO_SSH_KNOWN_HOSTS_ERROR     SSH_SERVER_ERROR
+
+#else
+#define TDEIO_SSH_KNOWN_HOSTS_OK        SSH_KNOWN_HOSTS_OK
+#define TDEIO_SSH_KNOWN_HOSTS_OTHER     SSH_KNOWN_HOSTS_OTHER
+#define TDEIO_SSH_KNOWN_HOSTS_CHANGED   SSH_KNOWN_HOSTS_CHANGED
+#define TDEIO_SSH_KNOWN_HOSTS_NOT_FOUND SSH_KNOWN_HOSTS_NOT_FOUND
+#define TDEIO_SSH_KNOWN_HOSTS_UNKNOWN   SSH_KNOWN_HOSTS_UNKNOWN
+#define TDEIO_SSH_KNOWN_HOSTS_ERROR     SSH_KNOWN_HOSTS_ERROR
+#endif
+
 namespace TDEIO {
   class AuthInfo;
 }