thooge
/
keepassx1
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix detection of g++ in src.pro 

Fix ftbfs on windows

git-svn-id: https://svn.code.sf.net/p/keepassx/code/trunk@291 b624d157-de02-0410-bad0-e51aec6abb33
This commit is contained in:
sniperbeamer 2009-03-18 13:41:55 +00:00
parent 9ce0432cff
commit db8c33e526
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Kdb3Database.cpp
View File

@ -1432,8 +1432,7 @@ bool Kdb3Database::save(){
aes.key256(FinalKey); aes.key256(FinalKey);
aes.cbc_encrypt((unsigned char*)buffer+DB_HEADER_SIZE,(unsigned char*)buffer+DB_HEADER_SIZE,EncryptedPartSize,(unsigned char*)EncryptionIV); aes.cbc_encrypt((unsigned char*)buffer+DB_HEADER_SIZE,(unsigned char*)buffer+DB_HEADER_SIZE,EncryptedPartSize,(unsigned char*)EncryptionIV);
} }
else{ else{ // Algorithm == Twofish_Cipher
if(Algorithm == Twofish_Cipher){
CTwofish twofish; CTwofish twofish;
if(twofish.init(FinalKey, 32, EncryptionIV) == false){ if(twofish.init(FinalKey, 32, EncryptionIV) == false){
UNEXP_ERROR UNEXP_ERROR
@ -1443,7 +1442,6 @@ bool Kdb3Database::save(){
EncryptedPartSize = (unsigned long)twofish.padEncrypt((quint8*)buffer+DB_HEADER_SIZE, EncryptedPartSize = (unsigned long)twofish.padEncrypt((quint8*)buffer+DB_HEADER_SIZE,
pos - DB_HEADER_SIZE,(quint8*)buffer+DB_HEADER_SIZE); pos - DB_HEADER_SIZE,(quint8*)buffer+DB_HEADER_SIZE);
} }
}
if((EncryptedPartSize > (0xFFFFFFE - 202)) || (!EncryptedPartSize && Groups.size())){ if((EncryptedPartSize > (0xFFFFFFE - 202)) || (!EncryptedPartSize && Groups.size())){
UNEXP_ERROR UNEXP_ERROR
delete [] buffer; delete [] buffer;

1
src/lib/tools.cpp
View File

@ -26,6 +26,7 @@
#include <sys/mman.h> #include <sys/mman.h>
#include <unistd.h> #include <unistd.h>
#elif defined(Q_WS_WIN) #elif defined(Q_WS_WIN)
#include <QLibrary>
#include <windows.h> #include <windows.h>
#include <io.h> #include <io.h>
#endif #endif

2
src/src.pro
View File

@ -2,7 +2,7 @@
CONFIG = qt uic resources thread stl warn_on CONFIG = qt uic resources thread stl warn_on
QT += xml 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 DEPENDPATH += crypto dialogs export forms import lib translations res
INCLUDEPATH += . lib crypto plugins/interfaces export import dialogs INCLUDEPATH += . lib crypto plugins/interfaces export import dialogs