Merge branch 'dev' of github.com:amnezia-vpn/amnezia-client into dev

chore: bump version to 4.8.1.8
- fixed m_isDevGatewayEnv initialization in Settings class
2024-09-29 22:29:17 +08:00 · 2024-09-29 22:27:49 +08:00
3 changed files with 4 additions and 4 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.25.0 FATAL_ERROR)

 set(PROJECT AmneziaVPN)

-project(${PROJECT} VERSION 4.8.1.1
+project(${PROJECT} VERSION 4.8.1.8
        DESCRIPTION "AmneziaVPN"
        HOMEPAGE_URL "https://amnezia.org/"
 )
--- a/client/core/controllers/apiController.cpp
+++ b/client/core/controllers/apiController.cpp
@ -357,9 +357,9 @@ ErrorCode ApiController::getConfigForService(const QString &installationUuid, co

        EVP_PKEY *publicKey = nullptr;
        try {
-            QByteArray key = m_isDevEnvironment ? DEV_AGW_PUBLIC_KEY : PROD_AGW_PUBLIC_KEY;
+            QByteArray rsaKey = m_isDevEnvironment ? DEV_AGW_PUBLIC_KEY : PROD_AGW_PUBLIC_KEY;
            QSimpleCrypto::QRsa rsa;
-            publicKey = rsa.getPublicKeyFromByteArray(key);
+            publicKey = rsa.getPublicKeyFromByteArray(rsaKey);
        } catch (...) {
            qCritical() << "error loading public key from environment variables";
            return ErrorCode::ApiMissingAgwPublicKey;
--- a/client/settings.h
+++ b/client/settings.h
@ -237,7 +237,7 @@ private:
    mutable SecureQSettings m_settings;

    QString m_gatewayEndpoint;
-    bool m_isDevGatewayEnv;
+    bool m_isDevGatewayEnv = false;
 };

 #endif // SETTINGS_H
Author	SHA1	Message	Date
vladimir.kuznetsov	b45f609531	Merge branch 'dev' of github.com:amnezia-vpn/amnezia-client into dev	2024-09-29 22:29:17 +08:00
vladimir.kuznetsov	ce01523a88	chore: bump version to 4.8.1.8 - fixed m_isDevGatewayEnv initialization in Settings class	2024-09-29 22:27:49 +08:00