diff --git a/.gitmodules b/.gitmodules index c410a486..5fde64e8 100644 --- a/.gitmodules +++ b/.gitmodules @@ -28,3 +28,6 @@ [submodule "client/3rd/libssh"] path = client/3rd/libssh url = https://git.libssh.org/projects/libssh.git/ +[submodule "client/3rd/zlib"] + path = client/3rd/zlib + url = https://github.com/madler/zlib.git diff --git a/client/3rd/libssh b/client/3rd/libssh index 438cc6df..e8322817 160000 --- a/client/3rd/libssh +++ b/client/3rd/libssh @@ -1 +1 @@ -Subproject commit 438cc6df52ca234ba8f04734e628ca74c03b2971 +Subproject commit e8322817a9e5aaef0698d779ddd467a209a85d85 diff --git a/client/3rd/zlib b/client/3rd/zlib new file mode 160000 index 00000000..04f42cec --- /dev/null +++ b/client/3rd/zlib @@ -0,0 +1 @@ +Subproject commit 04f42ceca40f73e2978b50e93806c2a18c1281fc diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index 2fe60265..339b55c2 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -37,14 +37,20 @@ set(LIBS ${LIBS} SortFilterProxyModel) include(${CMAKE_CURRENT_LIST_DIR}/3rd/qrcodegen/qrcodegen.cmake) include(${CMAKE_CURRENT_LIST_DIR}/3rd/QSimpleCrypto/QSimpleCrypto.cmake) +add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/3rd/zlib) +set(ZLIB_LIBRARY ${CMAKE_CURRENT_BINARY_DIR}/3rd/zlib) +set(ZLIB_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/3rd/zlib) +set(WITH_SERVER OFF) +set(WITH_GSSAPI OFF) +set(WITH_EXAMPLES OFF) +set(OPENSSL_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/3rd/OpenSSL/include) +add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/3rd/libssh) + set(BUILD_WITH_QT6 ON) set(BUILD_SHARED_LIBS OFF) add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/3rd/qtkeychain) set(LIBS ${LIBS} qt6keychain) -add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/3rd/libssh/include) -set(LIBS ${LIBS} ssh) - include_directories( ${CMAKE_CURRENT_LIST_DIR}/3rd/QSimpleCrypto/include ${CMAKE_CURRENT_LIST_DIR}/3rd/OpenSSL/include diff --git a/client/core/servercontroller.cpp b/client/core/servercontroller.cpp index ded0861a..34b0d6e3 100644 --- a/client/core/servercontroller.cpp +++ b/client/core/servercontroller.cpp @@ -410,7 +410,7 @@ ErrorCode ServerController::copyFileToRemoteHost(ssh_session& ssh, sftp_session& char buffer[SFTP_TRANSFER_CHUNK_SIZE]; int length {sizeof (buffer)}; - file = sftp_open(sftp, remote_path.c_str(), access_type, S_IRWXU); + file = sftp_open(sftp, remote_path.c_str(), access_type, 0);//S_IRWXU); if (file == NULL) { return ErrorCode::SshSftpError;