Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2024-10-01 01:26:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove some asserts in KeePass1Reader.

Browse Source
This commit is contained in:
Felix Geyer 2012-05-13 13:32:28 +02:00
parent 0387da48a4
commit 23792eb069
1 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/format/KeePass1Reader.cpp
View File

@ -112,49 +112,42 @@ Database* KeePass1Reader::readDatabase(QIODevice* device, const QString& passwor
m_masterSeed = m_device->read(16); m_masterSeed = m_device->read(16);
if (m_masterSeed.size() != 16) { if (m_masterSeed.size() != 16) {
// TODO: error // TODO: error
Q_ASSERT(false);
return 0; return 0;
} }
m_encryptionIV = m_device->read(16); m_encryptionIV = m_device->read(16);
if (m_encryptionIV.size() != 16) { if (m_encryptionIV.size() != 16) {
// TODO: error // TODO: error
Q_ASSERT(false);
return 0; return 0;
} }
quint32 numGroups = Endian::readUInt32(m_device, KeePass1::BYTEORDER, &ok); quint32 numGroups = Endian::readUInt32(m_device, KeePass1::BYTEORDER, &ok);
if (!ok) { if (!ok) {
// TODO: error // TODO: error
Q_ASSERT(false);
return 0; return 0;
} }
quint32 numEntries = Endian::readUInt32(m_device, KeePass1::BYTEORDER, &ok); quint32 numEntries = Endian::readUInt32(m_device, KeePass1::BYTEORDER, &ok);
if (!ok) { if (!ok) {
// TODO: error // TODO: error
Q_ASSERT(false);
return 0; return 0;
} }
m_contentHashHeader = m_device->read(32); m_contentHashHeader = m_device->read(32);
if (m_contentHashHeader.size() != 32) { if (m_contentHashHeader.size() != 32) {
// TODO: error // TODO: error
Q_ASSERT(false);
return 0; return 0;
} }
m_transformSeed = m_device->read(32); m_transformSeed = m_device->read(32);
if (m_transformSeed.size() != 32) { if (m_transformSeed.size() != 32) {
// TODO: error // TODO: error
Q_ASSERT(false);
return 0; return 0;
} }
m_transformRounds = Endian::readUInt32(m_device, KeePass1::BYTEORDER, &ok); m_transformRounds = Endian::readUInt32(m_device, KeePass1::BYTEORDER, &ok);
if (!ok) { if (!ok) {
// TODO: error // TODO: error
Q_ASSERT(false);
return 0; return 0;
} }
m_db->setTransformRounds(m_transformRounds); m_db->setTransformRounds(m_transformRounds);
@ -165,7 +158,6 @@ Database* KeePass1Reader::readDatabase(QIODevice* device, const QString& passwor
if (!cipherStream) { if (!cipherStream) {
// TODO: error // TODO: error
Q_ASSERT(false);
return 0; return 0;
} }
@ -339,7 +331,6 @@ SymmetricCipherStream* KeePass1Reader::testKeys(const QString& password, const Q
cipherStream->close(); cipherStream->close();
if (!m_device->seek(contentPos)) { if (!m_device->seek(contentPos)) {
// TODO: error // TODO: error
Q_ASSERT(false);
return 0; return 0;
} }
cipherStream->open(QIODevice::ReadOnly); cipherStream->open(QIODevice::ReadOnly);
@ -409,7 +400,6 @@ Group* KeePass1Reader::readGroup(QIODevice* cipherStream)
QByteArray fieldData = cipherStream->read(fieldSize); QByteArray fieldData = cipherStream->read(fieldSize);
if (fieldData.size() != fieldSize) { if (fieldData.size() != fieldSize) {
// TODO: error // TODO: error
Q_ASSERT(false);
return 0; return 0;
} }
@ -533,7 +523,6 @@ Entry* KeePass1Reader::readEntry(QIODevice* cipherStream)
QByteArray fieldData = cipherStream->read(fieldSize); QByteArray fieldData = cipherStream->read(fieldSize);
if (fieldData.size() != fieldSize) { if (fieldData.size() != fieldSize) {
// TODO: error // TODO: error
Q_ASSERT(false);
return 0; return 0;
} }