Merge pull request #969 from deXol/developPortQt6

Change rand calls to QRandomGenerator

Author: limpkin

daemon.pro

@@ -11,7 +11,7 @@ CONFIG -= app_bundle
 
 CONFIG += c++11
 
-INCLUDEPATH += $$PWD/src $$PWD/src/MessageProtocol $$PWD/src/Mooltipass $$PWD/src/Settings $$PWD/src/CyoEncode
+INCLUDEPATH += $$PWD/src $$PWD/src/MessageProtocol $$PWD/src/Mooltipass $$PWD/src/Settings $$PWD/src/CyoEncode $$PWD/src/SimpleCrypt
 
 win32 {
     LIBS += -lsetupapi -luser32

src/AppGui.cpp

@@ -54,7 +54,9 @@ AppGui::AppGui(int & argc, char ** argv) :
 
 bool AppGui::initialize()
 {
+#if QT_VERSION < 0x051000
     srand(time(NULL));
+#endif
 
     QCoreApplication::setOrganizationName("mooltipass");
     QCoreApplication::setOrganizationDomain("themooltipass.com");
@@ -736,7 +738,7 @@ void AppGui::checkUpdate(bool displayMessage)
 
     //Recheck in at least 30minutes plus some random time
     if (!displayMessage)
-        QTimer::singleShot(1000 * 60 * 60 * 30 + rand() % 240, [this]() { checkUpdate(false); });
+        QTimer::singleShot(1000 * 60 * 60 * 30 + Common::getRand() % 240, [this]() { checkUpdate(false); });
 }
 
 QString AppGui::getDataDirPath()

src/Common.cpp

@@ -364,7 +364,9 @@ QString Common::createUid(QString prefix)
     if (!commonUidInit)
     {
         commonUidInit = true;
+#if QT_VERSION < 0x051000
         srand(time(NULL));
+#endif
     }
 
     //try to generate a unique id based on
@@ -373,11 +375,11 @@ QString Common::createUid(QString prefix)
     {
         s = QStringLiteral("%1%2%3%4%5%6")
             .arg(prefix)
-            .arg(rand())
-            .arg(rand())
-            .arg(rand())
-            .arg(rand())
-            .arg(rand());
+            .arg(getRand())
+            .arg(getRand())
+            .arg(getRand())
+            .arg(getRand())
+            .arg(getRand());
     } while (commonExistingUid.contains(s));
 
     return s;
@@ -468,3 +470,12 @@ QByteArray Common::reverse(const QByteArray &array)
     }
     return res;
 }
+
+int Common::getRand()
+{
+#if QT_VERSION < 0x051000
+    return rand();
+#else
+    return QRandomGenerator::global()->generate();
+#endif
+}

src/Common.h

@@ -260,6 +260,8 @@ class Common
 
     static QByteArray reverse(const QByteArray& array);
 
+    static int getRand();
+
     typedef enum
     {
         MP_Classic = 0,

src/FilesCache.h

@@ -4,7 +4,7 @@
 #include <QList>
 #include <QVariantHash>
 #include <QObject>
-#include "SimpleCrypt/SimpleCrypt.h"
+#include "SimpleCrypt.h"
 
 class FilesCache : public QObject
 {

src/MPDevice_emul.cpp

@@ -19,7 +19,7 @@
 #include "MPDevice_emul.h"
 #include "MooltipassCmds.h"
 
-#define CLEAN_MEMORY_QBYTEARRAY(d) do {for (int i = 0; i < d.size(); i++){d[i] = rand() % 256;}} while(0);
+#define CLEAN_MEMORY_QBYTEARRAY(d) do {for (int i = 0; i < d.size(); i++){d[i] = Common::getRand() % 256;}} while(0);
 
 
 MPDevice_emul::MPDevice_emul(QObject *parent):
@@ -209,7 +209,7 @@ void MPDevice_emul::platformWrite(const QByteArray &data)
          d[0] = 32;
          d[1] = commandData;
          for (int i = 0; i < 32; i++)
-             d[2 + i] = rand() % 255;
+             d[2 + i] = Common::getRand() % 255;
          d.resize(64);
          sendReadSignal(d);
          break;

src/SimpleCrypt/SimpleCrypt.cpp

@@ -31,6 +31,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <QDateTime>
 #include <QCryptographicHash>
 #include <QDataStream>
+#include "Common.h"
 
 #if QT_VERSION < 0x060000
     using DeviceOpenModeFlag = QIODevice;
@@ -44,7 +45,9 @@ SimpleCrypt::SimpleCrypt():
     m_protectionMode(ProtectionChecksum),
     m_lastError(ErrorNoError)
 {
+#if QT_VERSION < 0x051000
     srand(uint(QDateTime::currentMSecsSinceEpoch() & 0xFFFF));
+#endif
 }
 
 SimpleCrypt::SimpleCrypt(quint64 key):
@@ -53,7 +56,9 @@ SimpleCrypt::SimpleCrypt(quint64 key):
     m_protectionMode(ProtectionChecksum),
     m_lastError(ErrorNoError)
 {
+#if QT_VERSION < 0x051000
     srand(uint(QDateTime::currentMSecsSinceEpoch() & 0xFFFF));
+#endif
     splitKey();
 }
 
@@ -119,7 +124,7 @@ QByteArray SimpleCrypt::encryptToByteArray(QByteArray plaintext)
     }
 
     //prepend a random char to the string
-    char randomChar = char(rand() & 0xFF);
+    char randomChar = char(Common::getRand() & 0xFF);
     ba = randomChar + integrityProtection + ba;
 
     int pos(0);

src/SimpleCrypt/SimpleCrypt.h

@@ -29,7 +29,10 @@ DEFINES += QT_DEPRECATED_WARNINGS
 
 include (../src/QSimpleUpdater/QSimpleUpdater.pri)
 
+INCLUDEPATH += $$PWD/../src $$PWD/../src/SimpleCrypt
+
 SOURCES += \
+    ../src/Common.cpp \
     ../src/SimpleCrypt/SimpleCrypt.cpp \
     ../src/FilesCache.cpp \
     ../src/DbBackupsTracker.cpp \
@@ -54,6 +57,7 @@ SOURCES += \
     TestParseDomain.cpp
 
 HEADERS += \
+    ../src/Common.h \
     ../src/SimpleCrypt/SimpleCrypt.h \
     ../src/FilesCache.h \
     ../src/DbBackupsTracker.h\