added qrng to generate better keys

Author: Skycoder42

src/3rdparty/qpm.json

@@ -3,7 +3,8 @@
   "description": "",
   "dependencies": [
     "[email protected]",
-    "[email protected]"
+    "[email protected]",
+    "[email protected]"
   ],
   "license": "NONE",
   "pri_filename": "",

src/datasync/changecontroller_p.h

@@ -74,7 +74,7 @@ public Q_SLOTS:
 Q_SIGNALS:
 	void loadLocalStatus();
 	void updateSyncState(SyncController::SyncState state);
-	void updateSyncProgress(quint32 remainingOperations);
+	void updateSyncProgress(int remainingOperations);
 
 	void beginRemoteOperation(const ChangeOperation &operation);
 	void beginLocalOperation(const ChangeOperation &operation);

src/datasync/datasync.pro

@@ -31,7 +31,7 @@ HEADERS += \
 	exceptions.h \
 	qtdatasync_global.h \
 	encryptor.h \
-    qtinyaesencryptor_p.h
+	qtinyaesencryptor_p.h
 
 SOURCES += \
 	asyncdatastore.cpp \
@@ -53,7 +53,7 @@ SOURCES += \
 	wsremoteconnector.cpp \
 	exceptions.cpp \
 	encryptor.cpp \
-    qtinyaesencryptor.cpp
+	qtinyaesencryptor.cpp
 
 OTHER_FILES += \
 	engine.qmodel

src/datasync/qtinyaesencryptor.cpp

@@ -5,6 +5,7 @@
 #include <QtCore/qcryptographichash.h>
 
 #include <qtinyaes.h>
+#include <qrng.h>
 using namespace QtDataSync;
 
 QTinyAesEncryptor::QTinyAesEncryptor(QObject *parent) :
@@ -19,8 +20,9 @@ void QTinyAesEncryptor::initialize(Defaults *defaults)
 	_defaults = defaults;
 	_key = _defaults->settings()->value(QStringLiteral("encryption/key")).toByteArray();
 	if(_key.isEmpty()) {
-		for(quint32 i = 0; i < QTinyAes::KEYSIZE; i++)
-			_key += (char)qrand();
+		QRng secureRng;
+		secureRng.setSecurityLevel(QRng::HighSecurity);
+		_key = secureRng.generateRandom(QTinyAes::KEYSIZE);
 		_defaults->settings()->setValue(QStringLiteral("encryption/key"), _key);
 	}
 }
@@ -42,9 +44,7 @@ void QTinyAesEncryptor::setKey(const QByteArray &key)
 
 QJsonValue QTinyAesEncryptor::encrypt(const ObjectKey &key, const QJsonObject &object, const QByteArray &keyProperty) const
 {
-	QByteArray salt;
-	for(quint32 i = 0; i < 28; i++)//224 bits
-		salt += (char)qrand();
+	auto salt = QRng().generateRandom(28);//224 bits
 	auto iv = QCryptographicHash::hash(salt + key.first + key.second.toUtf8() + keyProperty, QCryptographicHash::Sha3_224);
 	iv.resize(QTinyAes::BLOCKSIZE);
 

src/datasync/wsauthenticator.cpp

@@ -14,7 +14,7 @@ WsAuthenticator::WsAuthenticator(WsRemoteConnector *connector, Defaults *default
 	d->settings = defaults->createSettings(this);
 
 	connect(d->connector, &WsRemoteConnector::remoteStateChanged,
-			this, &WsAuthenticator::updateConnected,
+			this, [this](RemoteConnector::RemoteState s){updateConnected(s);},
 			Qt::QueuedConnection);
 }
 
@@ -132,9 +132,9 @@ RemoteConnector *WsAuthenticator::connector()
 	return d->connector;
 }
 
-void WsAuthenticator::updateConnected(bool connected)
+void WsAuthenticator::updateConnected(int connected)
 {
-	d->connected = connected;
+	d->connected = (connected != RemoteConnector::RemoteDisconnected);
 	emit connectedChanged(connected);
 }
 

src/datasync/wsauthenticator.h

@@ -81,7 +81,7 @@ public Q_SLOTS:
 	RemoteConnector *connector() override;
 
 private Q_SLOTS:
-	void updateConnected(bool connected);
+	void updateConnected(int connected);
 
 private:
 	QScopedPointer<WsAuthenticatorPrivate> d;