cmake: fix a bug that prevents rtrlib from using libssh versions abov…

…e 0.5.0. (#162)

CMakeLists.txt

@@ -30,27 +30,18 @@ set(RTRLIB_SRC rtrlib/rtr_mgr.c rtrlib/lib/utils.c rtrlib/lib/alloc_utils.c rtrl
     rtrlib/spki/hashtable/ht-spkitable.c rtrlib/spki/hashtable/tommyds-1.8/tommy.c)
 set(RTRLIB_LINK ${RT_LIB} ${CMAKE_THREAD_LIBS_INIT})
 
-find_package(LibSSH 0.6.0 QUIET)
+find_package(LibSSH 0.5.0 QUIET)
 if(LIBSSH_FOUND AND NOT NOSSH)
-    set(LIBSSH_060 1)
-    message(STATUS "libssh found, building librtr with SSH 0.6.0 support")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D LIBSSH_VERSION_MAJOR=${LibSSH_VERSION_MAJOR} -D LIBSSH_VERSION_MINOR=${LibSSH_VERSION_MINOR}")
+    set(RTRLIB_HAVE_LIBSSH 1)
+    include_directories(${LIBSSH_INCLUDE_DIRS})
+    set(RTRLIB_SRC ${RTRLIB_SRC} rtrlib/transport/ssh/ssh_transport.c)
+    set(RTRLIB_LINK ${RTRLIB_LINK} ${LIBSSH_LIBRARIES})
+    message(STATUS "libssh found, building librtr with SSH ${LibSSH_VERSION} support")
 else()
-    find_package(LibSSH 0.5.0)
-    if(LIBSSH_FOUND AND NOT NOSSH)
-        set(LIBSSH_050 1)
-        message(STATUS "libssh found, building librtr with SSH 0.5.0 support")
-    endif(LIBSSH_FOUND AND NOT NOSSH)
+    message(WARNING "libssh >=0.5.0 not found, building librtr without SSH support")
 endif(LIBSSH_FOUND AND NOT NOSSH)
 
-if(LIBSSH_050 OR LIBSSH_060)
-        set(RTRLIB_HAVE_LIBSSH 1)
-        include_directories(${LIBSSH_INCLUDE_DIRS})
-        set(RTRLIB_SRC ${RTRLIB_SRC} rtrlib/transport/ssh/ssh_transport.c)
-        set(RTRLIB_LINK ${RTRLIB_LINK} ${LIBSSH_LIBRARIES})
-else()
-        message(WARNING "libssh not found, building librtr without SSH support")
-endif(LIBSSH_050 OR LIBSSH_060)
-
 #doxygen target
 find_package(Doxygen)
 if(DOXYGEN_FOUND)

rtrlib/transport/ssh/ssh_transport.c

@@ -74,9 +74,9 @@ int tr_ssh_open(void *socket)
         goto error;
     }
 
-#ifdef LIBSSH_060
+#if LIBSSH_VERSION_MAJOR > 0 || LIBSSH_VERSION_MINOR > 5
     const int rtval = ssh_userauth_publickey_auto(ssh_socket->session, NULL, NULL);
-#else // else use libSSH version 0.5.0
+#else /* else use libSSH version 0.5.0 */
     const int rtval = ssh_userauth_autopubkey(ssh_socket->session, NULL);
 #endif
     if(rtval != SSH_AUTH_SUCCESS) {