AZEN-SGG/amnezia-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed connection with qssh

Browse source
This commit is contained in:
vladimir.kuznetsov 2022-11-18 16:18:46 +03:00
parent 2564430046
commit 87fed9fde3
3 changed files with 13 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

7
client/3rd/QtSsh/src/ssh/sshpacket.cpp
View file

@ -138,7 +138,7 @@ QByteArray AbstractSshPacket::generateMac(const SshAbstractCryptoFacility &crypt
quint32 seqNr) const quint32 seqNr) const
{ {
const quint32 seqNrBe = qToBigEndian(seqNr); const quint32 seqNrBe = qToBigEndian(seqNr);
QByteArray data(reinterpret_cast<const char *>(&seqNrBe), sizeof seqNrBe); QByteArray data(reinterpret_cast<const char *>(&seqNrBe), static_cast<int>(sizeof seqNrBe));
data += QByteArray(m_data.constData(), length() + 4); data += QByteArray(m_data.constData(), length() + 4);
return crypt.generateMac(data, data.size()); return crypt.generateMac(data, data.size());
} }
@ -150,8 +150,9 @@ quint32 AbstractSshPacket::minPacketSize() const
void AbstractSshPacket::setLengthField(QByteArray &data) void AbstractSshPacket::setLengthField(QByteArray &data)
{ {
const quint32 length = qToBigEndian(data.size() - 4); const quint32 length = qToBigEndian<quint32>(data.size() - 4);
data.replace(qsizetype(0), 4, reinterpret_cast<const char *>(&length), 4); data.replace(static_cast<qsizetype>(0), static_cast<qsizetype>(4),
reinterpret_cast<const char *>(&length), static_cast<qsizetype>(4));
} }
} // namespace Internal } // namespace Internal

4
client/CMakeLists.txt
View file

@ -42,7 +42,6 @@ set(BUILD_SHARED_LIBS OFF)
add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/3rd/qtkeychain) add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/3rd/qtkeychain)
set(LIBS ${LIBS} qt6keychain) set(LIBS ${LIBS} qt6keychain)
# TODO it seems like i'm doing it wrong
include_directories( include_directories(
${CMAKE_CURRENT_LIST_DIR}/3rd/QSimpleCrypto/include ${CMAKE_CURRENT_LIST_DIR}/3rd/QSimpleCrypto/include
${CMAKE_CURRENT_LIST_DIR}/3rd/OpenSSL/include ${CMAKE_CURRENT_LIST_DIR}/3rd/OpenSSL/include
@ -166,7 +165,7 @@ endif()
if(APPLE) if(APPLE)
add_compile_definitions(MVPN_MACOS) add_compile_definitions(MVPN_MACOS)
# ICON = $$PWD/images/app.icns //todo # ICON = $$PWD/images/app.icns
set(HEADERS ${HEADERS} ${CMAKE_CURRENT_LIST_DIR}/ui/macos_util.h) set(HEADERS ${HEADERS} ${CMAKE_CURRENT_LIST_DIR}/ui/macos_util.h)
set(SOURCES ${SOURCES} ${CMAKE_CURRENT_LIST_DIR}/ui/macos_util.mm) set(SOURCES ${SOURCES} ${CMAKE_CURRENT_LIST_DIR}/ui/macos_util.mm)
@ -368,6 +367,7 @@ if(ANDROID)
endforeach() endforeach()
endif() endif()
# deploy artifacts required to run the application to the debug build folder
if(WIN32) if(WIN32)
if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "8") if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "8")
set(DIR_NAME "x64") set(DIR_NAME "x64")

6
deploy/build_windows.bat
View file

@ -25,7 +25,6 @@ set RELEASE_DIR=%WORK_DIR:"=%
set OUT_APP_DIR=%RELEASE_DIR:"=%\client\release set OUT_APP_DIR=%RELEASE_DIR:"=%\client\release
set DEPLOY_DATA_DIR=%SCRIPT_DIR:"=%\data\windows\x%BUILD_ARCH:"=% set DEPLOY_DATA_DIR=%SCRIPT_DIR:"=%\data\windows\x%BUILD_ARCH:"=%
set INSTALLER_DATA_DIR=%RELEASE_DIR:"=%\installer\packages\%APP_DOMAIN:"=%\data set INSTALLER_DATA_DIR=%RELEASE_DIR:"=%\installer\packages\%APP_DOMAIN:"=%\data
@REM set QMAKE_STASH_FILE=%PROJECT_DIR:"=%\.qmake_stash
set TARGET_FILENAME=%PROJECT_DIR:"=%\%APP_NAME:"=%_x%BUILD_ARCH:"=%.exe set TARGET_FILENAME=%PROJECT_DIR:"=%\%APP_NAME:"=%_x%BUILD_ARCH:"=%.exe
echo "Environment:" echo "Environment:"
@ -47,12 +46,11 @@ powershell Import-PfxCertificate -FilePath %SCRIPT_DIR:"=%\PrivacyTechWindowsCer
echo "Cleanup..." echo "Cleanup..."
Rmdir /Q /S %RELEASE_DIR% Rmdir /Q /S %RELEASE_DIR%
@REM Del %QMAKE_STASH_FILE%
Del %TARGET_FILENAME% Del %TARGET_FILENAME%
call "%QT_BIN_DIR:"=%\qt-cmake" --version call "%QT_BIN_DIR:"=%\qt-cmake" --version
"%QT_BIN_DIR:"=%\windeployqt" -v "%QT_BIN_DIR:"=%\windeployqt" -v
cmake --version @REM use cmake from qt tools dir cmake --version
cd %PROJECT_DIR% cd %PROJECT_DIR%
call "%QT_BIN_DIR:"=%\qt-cmake" . -B %WORK_DIR% call "%QT_BIN_DIR:"=%\qt-cmake" . -B %WORK_DIR%
@ -101,4 +99,4 @@ cd %PROJECT_DIR%
signtool sign /v /sm /s My /n "Privacy Technologies OU" /fd sha256 /tr http://timestamp.comodoca.com/?td=sha256 /td sha256 "%TARGET_FILENAME%" signtool sign /v /sm /s My /n "Privacy Technologies OU" /fd sha256 /tr http://timestamp.comodoca.com/?td=sha256 /td sha256 "%TARGET_FILENAME%"
echo "Finished, see %TARGET_FILENAME%" echo "Finished, see %TARGET_FILENAME%"
REM exit 0 exit 0