Switch to Qt-native random number generator

psi-im · Mar 14, 2024 · a79090c · a79090c
1 parent 33906e7
commit a79090c
Show file tree

Hide file tree

Showing 18 changed files with 28 additions and 303 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -74,7 +74,7 @@ if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug" OR ("${CMAKE_BUILD_TYPE}" STREQUAL "Re
     include(debug-definitions)
 endif()
 
-if(QT_DEFAULT_MAJOR_VERSION STREQUAL "")
+if("${QT_DEFAULT_MAJOR_VERSION}" STREQUAL "")
     set(QT_DEFAULT_MAJOR_VERSION 5)
 endif()
 

diff --git a/src/xmpp/CMakeLists.txt b/src/xmpp/CMakeLists.txt
@@ -96,9 +96,6 @@ set(XMPP_HEADERS_PRIVATE
     zlib/zlibcompressor.h
     zlib/zlibdecompressor.h
     blake2/blake2qt.h
-
-    base/randomnumbergenerator.h
-    base/randrandomnumbergenerator.h
     base/timezone.h
 )
 
@@ -152,7 +149,6 @@ target_sources(iris PRIVATE
     xmpp-im/jingle-ibb.cpp
     xmpp-im/jingle-file.cpp
 
-    base/randomnumbergenerator.cpp
     base/timezone.cpp
 
     zlib/zlibcompressor.cpp

diff --git a/src/xmpp/base/randomnumbergenerator.cpp b/src/xmpp/base/randomnumbergenerator.cpp
diff --git a/src/xmpp/base/randomnumbergenerator.h b/src/xmpp/base/randomnumbergenerator.h
diff --git a/src/xmpp/base/randrandomnumbergenerator.h b/src/xmpp/base/randrandomnumbergenerator.h
diff --git a/src/xmpp/base/unittest/incrementingrandomnumbergenerator.h b/src/xmpp/base/unittest/incrementingrandomnumbergenerator.h
diff --git a/src/xmpp/base/unittest/randomnumbergeneratortest.cpp b/src/xmpp/base/unittest/randomnumbergeneratortest.cpp
diff --git a/src/xmpp/base/unittest/randrandomnumbergeneratortest.cpp b/src/xmpp/base/unittest/randrandomnumbergeneratortest.cpp
diff --git a/src/xmpp/sasl/digestmd5response.cpp b/src/xmpp/sasl/digestmd5response.cpp
@@ -18,17 +18,17 @@
 
 #include "xmpp/sasl/digestmd5response.h"
 
-#include "xmpp/base/randomnumbergenerator.h"
 #include "xmpp/sasl/digestmd5proplist.h"
 
 #include <QByteArray>
+#include <QRandomGenerator>
 #include <QtCrypto>
 #include <QtDebug>
 
 namespace XMPP {
 DIGESTMD5Response::DIGESTMD5Response(const QByteArray &challenge, const QString &service, const QString &host,
                                      const QString &arealm, const QString &user, const QString &authz,
-                                     const QByteArray &password, const RandomNumberGenerator &rand) : isValid_(true)
+                                     const QByteArray &password) : isValid_(true)
 {
     QString realm = arealm;
 
@@ -44,7 +44,7 @@ DIGESTMD5Response::DIGESTMD5Response(const QByteArray &challenge, const QString
     QByteArray a;
     a.resize(32);
     for (int n = 0; n < (int)a.size(); ++n) {
-        a[n] = (char)rand.generateNumberBetween(0, 255);
+        a[n] = (char)QRandomGenerator::global()->bounded(0, 256);
     }
     QByteArray cnonce = a.toBase64();
 

diff --git a/src/xmpp/sasl/digestmd5response.h b/src/xmpp/sasl/digestmd5response.h
@@ -23,13 +23,11 @@
 #include <QString>
 
 namespace XMPP {
-class RandomNumberGenerator;
 
 class DIGESTMD5Response {
 public:
     DIGESTMD5Response(const QByteArray &challenge, const QString &service, const QString &host, const QString &realm,
-                      const QString &user, const QString &authz, const QByteArray &password,
-                      const RandomNumberGenerator &rand);
+                      const QString &user, const QString &authz, const QByteArray &password);
 
     const QByteArray &getValue() const { return value_; }
 

diff --git a/src/xmpp/sasl/scramsha1message.cpp b/src/xmpp/sasl/scramsha1message.cpp
@@ -18,10 +18,10 @@
 
 #include "xmpp/sasl/scramsha1message.h"
 
-#include "xmpp/base/randomnumbergenerator.h"
 #include "xmpp/jid/jid.h"
 
 #include <QDebug>
+#include <QRandomGenerator>
 #include <QString>
 #include <QTextStream>
 #include <QtCrypto>
@@ -40,8 +40,8 @@ bool Normalize(const QString &username_in, QString &username_out)
     }
 }
 
-SCRAMSHA1Message::SCRAMSHA1Message(const QString &authzid, const QString &authcid, const QByteArray &cnonce,
-                                   const RandomNumberGenerator &rand) : isValid_(true)
+SCRAMSHA1Message::SCRAMSHA1Message(const QString &authzid, const QString &authcid, const QByteArray &cnonce) :
+    isValid_(true)
 {
     QString    result;
     QByteArray clientnonce;
@@ -57,7 +57,7 @@ SCRAMSHA1Message::SCRAMSHA1Message(const QString &authzid, const QString &authci
         QByteArray a;
         a.resize(32);
         for (int n = 0; n < (int)a.size(); ++n) {
-            a[n] = (char)rand.generateNumberBetween(0, 255);
+            a[n] = (char)QRandomGenerator::global()->bounded(0, 256);
         }
         clientnonce = a.toBase64();
     } else

diff --git a/src/xmpp/sasl/scramsha1message.h b/src/xmpp/sasl/scramsha1message.h
@@ -19,16 +19,13 @@
 #ifndef SCRAMSHA1MESSAGE_H
 #define SCRAMSHA1MESSAGE_H
 
-#include "xmpp/base/randomnumbergenerator.h"
-
 #include <QByteArray>
 #include <QString>
 
 namespace XMPP {
 class SCRAMSHA1Message {
 public:
-    SCRAMSHA1Message(const QString &authzid, const QString &authcid, const QByteArray &cnonce,
-                     const RandomNumberGenerator &rand);
+    SCRAMSHA1Message(const QString &authzid, const QString &authcid, const QByteArray &cnonce);
 
     const QByteArray &getValue() { return value_; }