andrei/amnezia-client
1
0
Fork 0
mirror of https://github.com/amnezia-vpn/amnezia-client.git synced 2026-06-23 02:00:20 +07:00
Code Issues Packages Projects Releases 10 Wiki Activity

add minor improvements

Browse Source
This commit is contained in:
Aleksandar Dimov
2024-03-27 23:41:28 +01:00
parent bd414191e9
commit ee7ac389a4
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/secure_qsettings.cpp
+7 -1
View File
@@ -16,6 +16,12 @@
using namespace QKeychain; using namespace QKeychain;
namespace {
constexpr auto settingsKeyTag{"settingsKeyTag"};
constexpr auto settingsIvTag{"settingsIvTag"};
constexpr auto keyChainName{"AmneziaVPN-Keychain"};
}
SecureQSettings::SecureQSettings(const QString &organization, const QString &application, QObject *parent) SecureQSettings::SecureQSettings(const QString &organization, const QString &application, QObject *parent)
: QObject { parent }, m_settings(organization, application, parent), encryptedKeys({ "Servers/serversList" }) : QObject { parent }, m_settings(organization, application, parent), encryptedKeys({ "Servers/serversList" })
{ {
@@ -50,7 +56,7 @@ QVariant SecureQSettings::value(const QString &key, const QVariant &defaultValue
// check if value is not encrypted, v. < 2.0.x // check if value is not encrypted, v. < 2.0.x
retVal = m_settings.value(key); retVal = m_settings.value(key);
if (retVal.isValid()) { if (retVal.isValid()) {
if (retVal.userType() == QVariant::ByteArray && retVal.toByteArray().mid(0, magicString.size()) == magicString) { if (retVal.userType() == QMetaType::QByteArray && retVal.toByteArray().mid(0, magicString.size()) == magicString) {
if (getEncKey().isEmpty() || getEncIv().isEmpty()) { if (getEncKey().isEmpty() || getEncIv().isEmpty()) {
qCritical() << "SecureQSettings::setValue Decryption requested, but key is empty"; qCritical() << "SecureQSettings::setValue Decryption requested, but key is empty";
client/secure_qsettings.h
+1 -5
View File
@@ -8,10 +8,6 @@
#include "keychain.h" #include "keychain.h"
constexpr const char *settingsKeyTag = "settingsKeyTag";
constexpr const char *settingsIvTag = "settingsIvTag";
constexpr const char *keyChainName = "AmneziaVPN-Keychain";
class SecureQSettings : public QObject class SecureQSettings : public QObject
{ {
Q_OBJECT Q_OBJECT
@@ -44,7 +40,7 @@ public:
private: private:
QSettings m_settings; QSettings m_settings;
mutable QMap<QString, QVariant> m_cache; mutable QHash<QString, QVariant> m_cache;
QStringList encryptedKeys; // encode only key listed here QStringList encryptedKeys; // encode only key listed here