Merge branch 'public' of github.com:Windscribe/desktop-v2

This is an unrelated histories merge so it looks quite large. However, all merge resolutions were made using only the newer v.2.3.15 history. As this branch contains all the changes in this master branches history.
This was done to preserve the git history of this branch since its inception.

# Conflicts:
#	.gitignore
#	LICENSE
#	README.md
#	backend/engine/engine.pro
#	backend/engine/engine/autoupdater/autoupdaterhelper_mac.cpp
#	backend/engine/engine/autoupdater/downloadhelper.cpp
#	backend/engine/engine/autoupdater/downloadhelper.h
#	backend/engine/engine/connectionmanager/finishactiveconnections.cpp
#	backend/engine/engine/connectionmanager/finishactiveconnections.h
#	backend/engine/engine/connectionmanager/stunnelmanager.cpp
#	backend/engine/engine/connectionmanager/wstunnelmanager.cpp
#	backend/engine/engine/dnsresolver/dnsutils_linux.cpp
#	backend/engine/engine/engine.cpp
#	backend/engine/engine/engine.h
#	backend/engine/engine/enginesettings.cpp
#	backend/engine/engine/enginesettings.h
#	backend/engine/engine/firewall/firewallcontroller_linux.cpp
#	backend/engine/engine/firewall/firewallcontroller_linux.h
#	backend/engine/engine/helper/helper_posix.cpp
#	backend/engine/engine/helper/helper_win.cpp
#	backend/engine/engine/helper/windscribeinstallhelper_win.cpp
#	backend/engine/engine/macaddresscontroller/macaddresscontroller_mac.cpp
#	backend/engine/engine/macaddresscontroller/macaddresscontroller_win.cpp
#	backend/engine/engine/networkdetectionmanager/inetworkdetectionmanager.h
#	backend/engine/engine/networkdetectionmanager/networkdetectionmanager_linux.cpp
#	backend/engine/engine/networkdetectionmanager/networkdetectionmanager_linux.h
#	backend/engine/engine/networkdetectionmanager/networkdetectionmanager_mac.cpp
#	backend/engine/engine/networkdetectionmanager/networkdetectionmanager_mac.h
#	backend/engine/engine/networkdetectionmanager/networkdetectionmanager_win.cpp
#	backend/engine/engine/networkdetectionmanager/networkdetectionmanager_win.h
#	backend/engine/engine/serverapi/serverapi.cpp
#	backend/engine/engine/serverapi/serverapi.h
#	backend/engine/engine/types/types.cpp
#	backend/engine/engineserver.cpp
#	backend/engine/engineserver.h
#	backend/engine/mac/info.plist
#	backend/engine/mac/windscribe_engine.entitlements
#	backend/engine/main.cpp
#	backend/engine/utils/dnsscripts_linux.cpp
#	backend/engine/utils/dnsscripts_linux.h
#	backend/linux/helper/helper.pro
#	backend/linux/helper/logger.cpp
#	backend/linux/helper/logger.h
#	backend/linux/helper/main.cpp
#	backend/linux/helper/server.cpp
#	backend/linux/helper/server.h
#	backend/linux/helper/wireguard/wireguardadapter.cpp
#	backend/linux/helper/wireguard/wireguardcommunicator.cpp
#	backend/linux/helper/wireguard/wireguardcontroller.cpp
#	backend/mac/helper/helper.xcodeproj/project.pbxproj
#	backend/mac/helper/src/helper-info.plist
#	backend/mac/helper/src/ipc/helper_security.mm
#	backend/mac/helper/src/logger.cpp
#	backend/mac/helper/src/server.cpp
#	backend/mac/kext/build_kext.sh
#	backend/mac/kext/readme.txt
#	backend/mac/kext/windscribe_kext.xcodeproj/project.pbxproj
#	backend/mac/kext/windscribe_kext/info.plist
#	backend/windows/windscribe_service/utils.cpp
#	backend/windows/windscribe_service/windscribe_service.cpp
#	backend/windows/windscribe_service/windscribe_service.vcxproj
#	backend/windows/windscribe_service/windscribe_service.vcxproj.filters
#	common/changelog.txt
#	common/ipc/commandfactory.cpp
#	common/ipc/proto/clientcommands.proto
#	common/ipc/proto/servercommands.proto
#	common/ipc/proto/types.proto
#	common/utils/executable_signature/executable_signature.cpp
#	common/utils/executable_signature/executable_signature.h
#	common/utils/executable_signature/executable_signature_mac.h
#	common/utils/executable_signature/executable_signature_mac.mm
#	common/utils/executable_signature/executable_signature_win.cpp
#	common/utils/executable_signature/executable_signature_win.h
#	common/utils/executable_signature/executablesignature_linux.cpp
#	common/utils/executable_signature/executablesignature_linux.h
#	common/utils/extraconfig.cpp
#	common/utils/extraconfig.h
#	common/utils/hardcodedsettings.cpp
#	common/utils/hardcodedsettings.h
#	common/utils/hardcodedsettings.ini
#	common/utils/linuxutils.cpp
#	common/utils/linuxutils.h
#	common/utils/macutils.h
#	common/utils/macutils.mm
#	common/utils/mergelog.cpp
#	common/utils/utils.cpp
#	common/utils/utils.h
#	common/utils/winutils.cpp
#	common/utils/winutils.h
#	common/version/windscribe_version.h
#	common/wintun/wintun-0.9.2/api/resources.rc
#	gui/authhelper/win/ws_com/ws_com/exports.cpp
#	gui/authhelper/win/ws_com/ws_com/ws_com.vcxproj
#	gui/authhelper/win/ws_com_server/ws_com_server/ws_com_server.vcxproj
#	gui/authhelper/win/ws_proxy_stub/ws_proxy_stub/ws_proxy_stub.vcxproj
#	gui/backend/backend.cpp
#	gui/backend/backend.h
#	gui/backend/preferences/preferences.cpp
#	gui/backend/preferences/preferenceshelper.cpp
#	gui/gui/connectwindow/connectstateprotocolport/connectstateprotocolport.cpp
#	gui/gui/gui.pro
#	gui/gui/info.plist
#	gui/gui/mainwindow.cpp
#	gui/gui/mainwindow.h
#	gui/gui/preferenceswindow/accountwindow/accountwindowitem.cpp
#	gui/gui/preferenceswindow/accountwindow/accountwindowitem.h
#	gui/gui/preferenceswindow/generalwindow/generalwindowitem.cpp
#	gui/gui/preferenceswindow/ipreferenceswindow.h
#	gui/gui/preferenceswindow/openurlitem.cpp
#	gui/gui/preferenceswindow/preferenceswindowitem.cpp
#	gui/gui/preferenceswindow/preferenceswindowitem.h
#	gui/gui/utils/authchecker_linux.cpp
#	gui/gui/utils/authchecker_win.cpp
#	gui/gui/utils/protoenumtostring.cpp
#	gui/launcher/mac/windscribelauncher.xcodeproj/project.pbxproj
#	gui/launcher/mac/windscribelauncher/info.plist
#	installer/linux/additional_files/wstunnel/windscribewstunnel
#	installer/linux/debian_package/DEBIAN/postinst
#	installer/linux/debian_package/DEBIAN/preinst
#	installer/linux/debian_package/DEBIAN/prerm
#	installer/linux/debian_package/etc/windscribe/update-resolv-conf
#	installer/linux/debian_package/etc/windscribe/update-systemd-resolved
#	installer/mac/installer/installer.xcodeproj/project.pbxproj
#	installer/mac/installer/installer/ForegroundView.m
#	installer/mac/installer/installer/Info.plist
#	installer/mac/installer/installer/helper/installhelper_mac.mm
#	installer/windows/installer/main.cpp
#	tools/build_all.py
#	tools/build_all.yml
#	tools/create_new_linux_keypair.sh
#	tools/deps/custom_qt/source_changes.json
#	tools/deps/install_boost.py
#	tools/vars/wireguard.yml
#	vs-chromium-project.txt

Author: Ed Guloien

.gitignore

@@ -13,6 +13,7 @@ installer/mac/installer/installer/temp_Info.plist
 test-exe/*
 common/keys/linux/key.pem
 common/keys/linux/key.pub
+common/keys/linux/key_pub.txt
 drawings/*/*.png
 /gui/authhelper/win/ws_proxy_stub/ws_proxy_stub/dlldata.c
 /gui/authhelper/win/ws_proxy_stub/ws_proxy_stub/ws_proxy_stub_h.h

LICENSE

@@ -336,4 +336,4 @@ This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
 library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
+Public License instead of this License.

README.md

@@ -13,6 +13,12 @@ BUILD_LIBS_PATH = $$PWD/../../build-libs
 
 INCLUDEPATH += $$COMMON_PATH
 
+# build_all.py adds 'use_signature_check' to the CONFIG environment when invoked without the '--no-sign' flag.
+contains(CONFIG, use_signature_check) {
+    CONFIG(release, debug|release) {
+        DEFINES += USE_SIGNATURE_CHECK
+    }
+}
 
 win32 {
 
@@ -142,7 +148,7 @@ LIBS += -framework NetworkExtension
 #QMAKE_OBJECTIVE_CFLAGS += -fobjc-arc
 
 #remove unused parameter warnings
-QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-parameter
+QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-parameter -Wno-deprecated-declarations
 
 #boost include and libs
 INCLUDEPATH += $$BUILD_LIBS_PATH/boost/include
@@ -171,7 +177,8 @@ SOURCES += engine/firewall/firewallcontroller_mac.cpp \
            engine/helper/helper_posix.cpp \
            engine/helper/helper_mac.cpp \
            engine/dnsresolver/dnsutils_mac.cpp \
-           engine/macaddresscontroller/macaddresscontroller_mac.cpp
+           engine/macaddresscontroller/macaddresscontroller_mac.cpp \
+           engine/autoupdater/autoupdaterhelper_mac.cpp
 
 HEADERS +=     $$COMMON_PATH/utils/macutils.h \
                engine/connectionmanager/sleepevents_mac.h \
@@ -189,7 +196,8 @@ HEADERS +=     $$COMMON_PATH/utils/macutils.h \
                engine/ping/pinghost_icmp_mac.h \
                engine/networkdetectionmanager/networkdetectionmanager_mac.h \
                engine/macaddresscontroller/macaddresscontroller_mac.h \
-               $$COMMON_PATH/utils/executable_signature/executable_signature_mac.h
+               $$COMMON_PATH/utils/executable_signature/executable_signature_mac.h \
+               engine/autoupdater/autoupdaterhelper_mac.h
 
 OBJECTIVE_HEADERS += \
                engine/networkdetectionmanager/reachability.h \
@@ -214,22 +222,25 @@ QMAKE_INFO_PLIST = mac/info.plist
 
 #QMAKE_LFLAGS += -sectcreate __TEXT __info_plist $$shell_quote($$PWD/Mac/Info.plist)
 
-MY_ENTITLEMENTS.name = CODE_SIGN_ENTITLEMENTS
-MY_ENTITLEMENTS.value = $$PWD/mac/windscribe.entitlements
-QMAKE_MAC_XCODE_SETTINGS += MY_ENTITLEMENTS
+# The referenced file doesn't exist... perhaps this is old debugging code?
+#MY_ENTITLEMENTS.name = CODE_SIGN_ENTITLEMENTS
+#MY_ENTITLEMENTS.value = $$PWD/mac/windscribe.entitlements
+#QMAKE_MAC_XCODE_SETTINGS += MY_ENTITLEMENTS
 
 #postbuild copy commands
 copy_resources.commands = $(COPY_DIR) $$PWD/mac/resources $$OUT_PWD/WindscribeEngine.app/Contents
 mkdir_launch_services.commands = $(MKDIR) $$OUT_PWD/WindscribeEngine.app/Contents/Library/LaunchServices
 copy_helper.commands = $(COPY_DIR) $$PWD/../../installer/mac/binaries/helper/com.windscribe.helper.macos $$OUT_PWD/WindscribeEngine.app/Contents/Library/LaunchServices
-copy_profile.commands = $(COPY_DIR) $$PWD/../mac/provisioning_profile/embedded.provisionprofile $$OUT_PWD/WindscribeEngine.app/Contents
 mkdir_helpers.commands = $(MKDIR) $$OUT_PWD/WindscribeEngine.app/Contents/Helpers
 copy_openvpn.commands = cp $$BUILD_LIBS_PATH/openvpn_2_5_4/openvpn $$OUT_PWD/WindscribeEngine.app/Contents/Helpers/windscribeopenvpn_2_5_4
 copy_stunnel.commands = cp $$BUILD_LIBS_PATH/stunnel/stunnel $$OUT_PWD/WindscribeEngine.app/Contents/Helpers/windscribestunnel
 copy_wstunnel.commands = cp $$PWD/../mac/wstunnel/windscribewstunnel $$OUT_PWD/WindscribeEngine.app/Contents/Helpers/windscribewstunnel
 copy_kext.commands = $(COPY_DIR) $$PWD/../mac/kext/Binary/WindscribeKext.kext $$OUT_PWD/WindscribeEngine.app/Contents/Helpers/WindscribeKext.kext
 copy_wireguard.commands = cp $$BUILD_LIBS_PATH/wireguard/windscribewireguard $$OUT_PWD/WindscribeEngine.app/Contents/Helpers/windscribewireguard
 
+exists( $$PWD/../mac/provisioning_profile/embedded.provisionprofile ) {
+    copy_profile.commands = $(COPY_DIR) $$PWD/../mac/provisioning_profile/embedded.provisionprofile $$OUT_PWD/WindscribeEngine.app/Contents
+}
 
 first.depends = $(first) copy_resources mkdir_launch_services copy_helper copy_profile mkdir_helpers copy_openvpn copy_stunnel copy_wstunnel copy_wireguard copy_kext
 export(first.depends)
@@ -250,19 +261,16 @@ QMAKE_EXTRA_TARGETS += first copy_resources mkdir_launch_services copy_helper co
 
 linux {
 
-# uncomment for use signature checking on Linux
-#DEFINES += USE_SIGNATURE_CHECK_ON_LINUX
-
 #remove linux deprecated copy warnings
 QMAKE_CXXFLAGS_WARN_ON += -Wno-deprecated-copy
 
-
 #boost include and libs
 INCLUDEPATH += $$BUILD_LIBS_PATH/boost/include
 LIBS += $$BUILD_LIBS_PATH/boost/lib/libboost_serialization.a
+LIBS += $$BUILD_LIBS_PATH/boost/lib/libboost_filesystem.a
 
 INCLUDEPATH += $$BUILD_LIBS_PATH/openssl/include
-LIBS+=-L$$BUILD_LIBS_PATH/openssl/lib -lssl -lcrypto
+LIBS +=-L$$BUILD_LIBS_PATH/openssl/lib -lssl -lcrypto
 INCLUDEPATH += $$BUILD_LIBS_PATH/curl/include
 LIBS += -L$$BUILD_LIBS_PATH/curl/lib/ -lcurl
 
@@ -299,11 +307,6 @@ HEADERS += \
            engine/networkdetectionmanager/networkdetectionmanager_linux.h \
            engine/macaddresscontroller/macaddresscontroller_linux.h
 
-contains(DEFINES, USE_SIGNATURE_CHECK_ON_LINUX) {
-    RESOURCES += \
-        $$COMMON_PATH/common_linux.qrc
-}
-
 } # linux
 
 
@@ -323,6 +326,7 @@ SOURCES += main.cpp \
     application/windowsnativeeventfilter.cpp \
     application/windscribeapplication.cpp \
     engine/apiinfo/apiinfo.cpp \
+    engine/apiinfo/checkupdate.cpp \
     engine/apiinfo/sessionstatus.cpp \
     engine/apiinfo/location.cpp \
     engine/apiinfo/group.cpp \
@@ -349,7 +353,6 @@ SOURCES += main.cpp \
     engine/locationsmodel/nodeselectionalgorithm.cpp \
     engine/packetsizecontroller.cpp \
     engine/enginesettings.cpp \
-    engine/autoupdater/autoupdaterhelper_mac.cpp \
     engine/tempscripts_mac.cpp \
     $$COMMON_PATH/utils/simplecrypt.cpp \
     engine/logincontroller/logincontroller.cpp \
@@ -373,6 +376,7 @@ SOURCES += main.cpp \
     engine/connectionmanager/connectionmanager.cpp \
     engine/connectionmanager/availableport.cpp \
     engine/connectionmanager/wireguardconnection.cpp \
+    engine/macaddresscontroller/imacaddresscontroller.cpp \
     $$COMMON_PATH/types/locationid.cpp \
     engine/logincontroller/getapiaccessips.cpp \
     engine/helper/initializehelper.cpp \
@@ -446,6 +450,7 @@ SOURCES += main.cpp \
     engine/networkaccessmanager/networkaccessmanager.cpp
 
 HEADERS  +=  engine/locationsmodel/locationsmodel.h \
+    engine/apiinfo/checkupdate.h \
     engine/locationsmodel/apilocationsmodel.h \
     engine/locationsmodel/customconfiglocationsmodel.h \
     engine/locationsmodel/locationitem.h \
@@ -494,7 +499,6 @@ HEADERS  +=  engine/locationsmodel/locationsmodel.h \
     engine/ping/keepalivemanager.h \
     engine/packetsizecontroller.h \
     engine/enginesettings.h \
-    engine/autoupdater/autoupdaterhelper_mac.h \
     engine/connectionmanager/stunnelmanager.h \
     engine/tempscripts_mac.h \
     $$COMMON_PATH/utils/simplecrypt.h \

backend/engine/engine.pro

@@ -0,0 +1,67 @@
+#include "checkupdate.h"
+#include <QMetaType>
+
+const int typeIdCheckUpdate = qRegisterMetaType<apiinfo::CheckUpdate>("apiinfo::CheckUpdate");
+
+namespace apiinfo {
+
+bool CheckUpdate::initFromJson(QJsonObject &json, QString &outErrorMessage)
+{
+    // check for required fields in json
+    QStringList required_fields({"current_version", "supported", "latest_version", "latest_build", "is_beta",
+                                 "min_version", "update_needed_flag", "update_url"});
+    for (const QString &str : required_fields)
+    {
+        if (!json.contains(str))
+        {
+            outErrorMessage = str + " field not found";
+            return false;
+        }
+    }
+
+    d->cui_.set_is_available(true); // is_available used as success indicator in gui
+    d->cui_.set_version(json["latest_version"].toString().toStdString());
+    d->cui_.set_latest_build(json["latest_build"].toInt());
+    d->cui_.set_update_channel(static_cast<ProtoTypes::UpdateChannel>(json["is_beta"].toInt()));
+    d->cui_.set_url(json["update_url"].toString().toStdString());
+    d->cui_.set_is_supported(json["supported"].toInt() == 1);
+
+    if (json.contains("sha256"))
+    {
+        d->cui_.set_sha256(json["sha256"].toString().toStdString());
+    }
+    d->isInitialized_ = true;
+    return true;
+}
+
+void CheckUpdate::initFromProtoBuf(const ProtoTypes::CheckUpdateInfo &cui)
+{
+    d->cui_ = cui;
+    d->isInitialized_ = true;
+}
+
+ProtoTypes::CheckUpdateInfo CheckUpdate::getProtoBuf() const
+{
+    Q_ASSERT(d->isInitialized_);
+    return d->cui_;
+}
+
+QString CheckUpdate::getUrl() const
+{
+    Q_ASSERT(d->isInitialized_);
+    return QString::fromStdString(d->cui_.url());
+}
+
+QString CheckUpdate::getSha256() const
+{
+    Q_ASSERT(d->isInitialized_);
+    return QString::fromStdString(d->cui_.sha256());
+}
+
+bool CheckUpdate::isInitialized() const
+{
+    return d->isInitialized_;
+}
+
+
+} // apiinfo namespace

backend/engine/engine/apiinfo/checkupdate.cpp

@@ -0,0 +1,47 @@
+#ifndef CHECKUPDATE_H
+#define CHECKUPDATE_H
+
+#include <QString>
+#include <QJsonObject>
+#include <QSharedDataPointer>
+#include "utils/protobuf_includes.h"
+
+namespace apiinfo {
+
+class CheckUpdateData : public QSharedData
+{
+public:
+    CheckUpdateData() : isInitialized_(false) {}
+
+    CheckUpdateData(const CheckUpdateData &other)
+        : QSharedData(other),
+          isInitialized_(other.isInitialized_),
+          cui_(other.cui_) {}
+    ~CheckUpdateData() {}
+
+    bool isInitialized_;
+    ProtoTypes::CheckUpdateInfo cui_;  // only this data is saved in settings
+};
+
+// implicitly shared class CheckUpdate
+class CheckUpdate
+{
+public:
+    explicit CheckUpdate() : d(new CheckUpdateData) {}
+    CheckUpdate(const CheckUpdate &other) : d (other.d) {}
+
+    bool initFromJson(QJsonObject &json, QString &outErrorMessage);
+    void initFromProtoBuf(const ProtoTypes::CheckUpdateInfo &cui);
+    ProtoTypes::CheckUpdateInfo getProtoBuf() const;
+
+    QString getUrl() const;
+    QString getSha256() const;
+    bool isInitialized() const;
+
+private:
+    QSharedDataPointer<CheckUpdateData> d;
+};
+
+} // apiinfo namespace
+
+#endif // CHECKUPDATE_H

backend/engine/engine/apiinfo/checkupdate.h

@@ -80,9 +80,10 @@ bool AutoUpdaterHelper_mac::verifyAndRun(const QString &tempInstallerFilename,
 
     // verify installer
     qCDebug(LOG_AUTO_UPDATER) << "Verifying signature and certificate of installer: " << tempInstallerFilename;
-    if (!ExecutableSignature::verifyWithSignCheck(tempInstallerFilename))
+    ExecutableSignature sigCheck;
+    if (!sigCheck.verifyWithSignCheck(tempInstallerFilename.toStdWString()))
     {
-        qDebug(LOG_AUTO_UPDATER) << "Failed to verify signature and certificate of downloaded installer";
+        qDebug(LOG_AUTO_UPDATER) << "Failed to verify signature and certificate of downloaded installer: " << QString::fromStdString(sigCheck.lastError());
         Utils::removeDirectory(tempInstallerFilename);
         error_ = ProtoTypes::UPDATE_VERSION_ERROR_SIGN_FAIL;
         return false;

backend/engine/engine/autoupdater/autoupdaterhelper_mac.cpp

@@ -12,9 +12,10 @@
 #include "utils/linuxutils.h"
 #endif
 
-DownloadHelper::DownloadHelper(QObject *parent, NetworkAccessManager *networkAccessManager) : QObject(parent)
+DownloadHelper::DownloadHelper(QObject *parent, NetworkAccessManager *networkAccessManager, const QString &platform) : QObject(parent)
   , networkAccessManager_(networkAccessManager)
   , busy_(false)
+  , platform_(platform)
   , downloadDirectory_(QStandardPaths::writableLocation(QStandardPaths::DataLocation))
   , progressPercent_(0)
   , state_(DOWNLOAD_STATE_INIT)
@@ -37,7 +38,7 @@ const QString DownloadHelper::downloadInstallerPath()
     const QString path = downloadInstallerPathWithoutExtension() + ".dmg";
 #elif defined Q_OS_LINUX
     QString path;
-    if(LinuxUtils::isDeb()) {
+    if(platform_ == LinuxUtils::DEB_PLATFORM_NAME) { // if getPlatformName() fails, we should never get this far anyway
         path = downloadInstallerPathWithoutExtension() + ".deb";
     }
     else {
@@ -213,22 +214,7 @@ void DownloadHelper::removeAutoUpdateInstallerFiles()
         QFile::remove(installerPath);
     }
 
-#ifdef Q_OS_LINUX
-    // remove pre-existing signature and public key:
-    // | signature and key were required to verify the auto-update installer
-    const QString &signaturePath = signatureInstallPath();
-    if (QFile::exists(signaturePath))
-    {
-        qCDebug(LOG_DOWNLOADER) << "Removing auto-update installer signature";
-        QFile::remove(signaturePath);
-    }
-    const QString &publicKeyPath = publicKeyInstallPath();
-    if (QFile::exists(publicKeyPath))
-    {
-        qCDebug(LOG_DOWNLOADER) << "Removing auto-update installer key";
-        QFile::remove(publicKeyPath);
-    }
-#elif defined Q_OS_MAC
+#ifdef Q_OS_MAC
     // remove temp installer.app on mac:
     // | installer.app was unpacked from above .dmg
     const QString & installerApp = downloadDirectory_ + "/" + INSTALLER_FILENAME_MAC_APP;
@@ -271,13 +257,3 @@ void DownloadHelper::deleteAllReplies()
         reply->deleteLater();
     }
 }
-
-const QString DownloadHelper::publicKeyInstallPath()
-{
-    return downloadInstallerPathWithoutExtension() + ".key";
-}
-
-const QString DownloadHelper::signatureInstallPath()
-{
-    return downloadInstallerPath() + ".sig";
-}

backend/engine/engine/autoupdater/downloadhelper.cpp

@@ -14,7 +14,7 @@ class DownloadHelper : public QObject
 {
     Q_OBJECT
 public:
-    explicit DownloadHelper(QObject *parent, NetworkAccessManager *networkAccessManager);
+    explicit DownloadHelper(QObject *parent, NetworkAccessManager *networkAccessManager, const QString &platform);
     ~DownloadHelper();
 
     enum DownloadState {
@@ -26,8 +26,6 @@ class DownloadHelper : public QObject
 
     const QString downloadInstallerPath();
     const QString downloadInstallerPathWithoutExtension();
-    const QString publicKeyInstallPath();
-    const QString signatureInstallPath();
 
     void get(QMap<QString, QString> downloads);
     void stop();
@@ -55,6 +53,7 @@ private slots:
 
     QMap<NetworkReply*, FileAndProgress> replies_;
     bool busy_;
+    const QString platform_;
 
     QString downloadDirectory_;
     uint progressPercent_;