diff --git a/src/Kdb3Database.cpp b/src/Kdb3Database.cpp index da9f799..63039c8 100644 --- a/src/Kdb3Database.cpp +++ b/src/Kdb3Database.cpp @@ -1432,17 +1432,15 @@ bool Kdb3Database::save(){ aes.key256(FinalKey); aes.cbc_encrypt((unsigned char*)buffer+DB_HEADER_SIZE,(unsigned char*)buffer+DB_HEADER_SIZE,EncryptedPartSize,(unsigned char*)EncryptionIV); } - else{ - if(Algorithm == Twofish_Cipher){ - CTwofish twofish; - if(twofish.init(FinalKey, 32, EncryptionIV) == false){ - UNEXP_ERROR - delete [] buffer; - return false; - } - EncryptedPartSize = (unsigned long)twofish.padEncrypt((quint8*)buffer+DB_HEADER_SIZE, - pos - DB_HEADER_SIZE,(quint8*)buffer+DB_HEADER_SIZE); + else{ // Algorithm == Twofish_Cipher + CTwofish twofish; + if(twofish.init(FinalKey, 32, EncryptionIV) == false){ + UNEXP_ERROR + delete [] buffer; + return false; } + EncryptedPartSize = (unsigned long)twofish.padEncrypt((quint8*)buffer+DB_HEADER_SIZE, + pos - DB_HEADER_SIZE,(quint8*)buffer+DB_HEADER_SIZE); } if((EncryptedPartSize > (0xFFFFFFE - 202)) || (!EncryptedPartSize && Groups.size())){ UNEXP_ERROR diff --git a/src/lib/tools.cpp b/src/lib/tools.cpp index e99e516..38a2760 100644 --- a/src/lib/tools.cpp +++ b/src/lib/tools.cpp @@ -26,6 +26,7 @@ #include #include #elif defined(Q_WS_WIN) + #include #include #include #endif diff --git a/src/src.pro b/src/src.pro index 75f9260..7100105 100644 --- a/src/src.pro +++ b/src/src.pro @@ -2,7 +2,7 @@ CONFIG = qt uic resources thread stl warn_on QT += xml -contains(QMAKE_CXX, g++) : QMAKE_CXXFLAGS_WARN_ON += -Wno-sign-compare +*-g++ : QMAKE_CXXFLAGS_WARN_ON += -Wno-sign-compare DEPENDPATH += crypto dialogs export forms import lib translations res INCLUDEPATH += . lib crypto plugins/interfaces export import dialogs