diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index dbe317c..82cc27e 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -8,7 +8,6 @@ if(NOT ZLIB_FOUND) set(ZLIB_LIBRARY zlib) endif(NOT ZLIB_FOUND) -add_subdirectory(cryptopp) add_subdirectory(quazip) #add_subdirectory(aggregation) #add_subdirectory(extensionsystem) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e2c99e0..df5124a 100755 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -518,7 +518,6 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}/lib - ${CMAKE_SOURCE_DIR}/lib/openssl/include ) if (APPLE) @@ -567,7 +566,7 @@ if(UNIX) -lpthread X11 quazip - cryptlib + cryptopp Qt5::Svg Qt5::WebEngine Qt5::WebChannel diff --git a/src/share/WizEnc.cpp b/src/share/WizEnc.cpp index 7cfc4bf..aed5a31 100755 --- a/src/share/WizEnc.cpp +++ b/src/share/WizEnc.cpp @@ -110,7 +110,7 @@ bool WizAES::encrypt(QDataStream* pStreamSrc, QDataStream* pStreamDest) memcpy(padding, pBufferSrc + prefix, pad); } memset(padding + pad, 16 - pad, 16 - pad); - enc.ProcessLastBlock(pBufferDest + prefix, padding, 16); + enc.ProcessLastBlock(pBufferDest + prefix, 16, padding, 16); if (pStreamDest->writeRawData((char *)pBufferDest, prefix + 16) == -1) { //throw std::exception("Failed to write data to stream!"); @@ -232,7 +232,7 @@ bool WizAES::decrypt(QDataStream* pStreamSrc, QDataStream* pStreamDest) return false; } - dec.ProcessLastBlock(padding, pBufferSrc, 16); + dec.ProcessLastBlock(padding, 16, pBufferSrc, 16); int pad = padding[15]; if (pad > 16) { //throw std::exception("Failed to process last block!\nInvalid password?"); diff --git a/src/sync/WizAvatarHost.cpp b/src/sync/WizAvatarHost.cpp index 29374d7..f367734 100755 --- a/src/sync/WizAvatarHost.cpp +++ b/src/sync/WizAvatarHost.cpp @@ -14,6 +14,7 @@ #include #include #include +#include #include "WizApiEntry.h" #include "../utils/WizPathResolve.h"