Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-07-29 01:28:47 -04:00
Code Issues Projects Releases Packages Wiki Activity

Use QUINT32_MAX in tests instead of hardcoding the number.

Browse source
This commit is contained in:
Felix Geyer 2013-10-12 19:11:57 +02:00
parent 98d888063b
commit 7dde8a771f
3 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/core/Global.h
View file

@ -128,4 +128,8 @@ template <> class QStaticAssertFailure<true> {};
# define KEEPASSX_EXPORT Q_DECL_EXPORT # define KEEPASSX_EXPORT Q_DECL_EXPORT
#endif #endif
#ifndef QUINT32_MAX
#define QUINT32_MAX 4294967295U
#endif
#endif // KEEPASSX_GLOBAL_H #endif // KEEPASSX_GLOBAL_H

4
src/crypto/Random.cpp
View file

@ -21,10 +21,6 @@
#include "crypto/Crypto.h" #include "crypto/Crypto.h"
#ifndef QUINT32_MAX
#define QUINT32_MAX 4294967295U
#endif
class RandomBackendGcrypt : public RandomBackend class RandomBackendGcrypt : public RandomBackend
{ {
public: public:

12
tests/TestRandom.cpp
View file

@ -46,18 +46,18 @@ void TestRandom::testUInt()
QCOMPARE(randomGen()->randomUInt(1), 0U); QCOMPARE(randomGen()->randomUInt(1), 0U);
nextBytes.clear(); nextBytes.clear();
nextBytes.append(Endian::int32ToBytes(4294967295U, QSysInfo::ByteOrder)); nextBytes.append(Endian::int32ToBytes(QUINT32_MAX, QSysInfo::ByteOrder));
nextBytes.append(Endian::int32ToBytes(4294897295U, QSysInfo::ByteOrder)); nextBytes.append(Endian::int32ToBytes(QUINT32_MAX - 70000U, QSysInfo::ByteOrder));
m_backend->setNextBytes(nextBytes); m_backend->setNextBytes(nextBytes);
QCOMPARE(randomGen()->randomUInt(100000U), 97295U); QCOMPARE(randomGen()->randomUInt(100000U), (QUINT32_MAX - 70000U) % 100000U);
nextBytes.clear(); nextBytes.clear();
for (int i = 0; i < 10000; i++) { for (int i = 0; i < 10000; i++) {
nextBytes.append(Endian::int32ToBytes(2147483648U + i, QSysInfo::ByteOrder)); nextBytes.append(Endian::int32ToBytes((QUINT32_MAX / 2U) + 1U + i, QSysInfo::ByteOrder));
} }
nextBytes.append(Endian::int32ToBytes(2147483647U, QSysInfo::ByteOrder)); nextBytes.append(Endian::int32ToBytes(QUINT32_MAX / 2U, QSysInfo::ByteOrder));
m_backend->setNextBytes(nextBytes); m_backend->setNextBytes(nextBytes);
QCOMPARE(randomGen()->randomUInt(2147483648U), 2147483647U); QCOMPARE(randomGen()->randomUInt((QUINT32_MAX / 2U) + 1U), QUINT32_MAX / 2U);
} }
void TestRandom::testUIntRange() void TestRandom::testUIntRange()