diff options
| author | Janek Bevendorff <janek@jbev.net> | 2017-12-16 19:32:39 +0300 |
|---|---|---|
| committer | Jonathan White <support@dmapps.us> | 2018-01-13 22:23:27 +0300 |
| commit | d1a19a1009fe237406d35431c75b01362d5a7aee (patch) | |
| tree | a65d2f492f9b0af90f3b1c6cd069da75462e5e19 /src/format/KeePass2Reader.cpp | |
| parent | 3461cbfb060012dbdaaea5af418eccbeb0fedc04 (diff) | |
Refactor Endian namespace
Diffstat (limited to 'src/format/KeePass2Reader.cpp')
| -rw-r--r-- | src/format/KeePass2Reader.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/format/KeePass2Reader.cpp b/src/format/KeePass2Reader.cpp index a09f0adce..5d62794d4 100644 --- a/src/format/KeePass2Reader.cpp +++ b/src/format/KeePass2Reader.cpp @@ -99,13 +99,13 @@ Database* KeePass2Reader::readDatabase(QIODevice* device, const CompositeKey& ke bool ok; - quint32 signature1 = Endian::readUInt32(device, KeePass2::BYTEORDER, &ok); + quint32 signature1 = Endian::readSizedInt<quint32>(device, KeePass2::BYTEORDER, &ok); if (!ok || signature1 != KeePass2::SIGNATURE_1) { raiseError(tr("Not a KeePass database.")); return nullptr; } - quint32 signature2 = Endian::readUInt32(device, KeePass2::BYTEORDER, &ok); + quint32 signature2 = Endian::readSizedInt<quint32>(device, KeePass2::BYTEORDER, &ok); if (ok && signature2 == KeePass1::SIGNATURE_2) { raiseError(tr("The selected file is an old KeePass 1 database (.kdb).\n\n" "You can import it by clicking on Database > 'Import KeePass 1 database...'.\n" @@ -118,7 +118,7 @@ Database* KeePass2Reader::readDatabase(QIODevice* device, const CompositeKey& ke return nullptr; } - m_version = Endian::readUInt32(device, KeePass2::BYTEORDER, &ok) + m_version = Endian::readSizedInt<quint32>(device, KeePass2::BYTEORDER, &ok) & KeePass2::FILE_VERSION_CRITICAL_MASK; quint32 maxVersion = KeePass2::FILE_VERSION & KeePass2::FILE_VERSION_CRITICAL_MASK; if (!ok || (m_version < KeePass2::FILE_VERSION_MIN) || (m_version > maxVersion)) { |