3 files changed, 31 insertions, 12 deletions
diff --git a/externals/boost b/externals/boost
-Subproject f005c955f8147a29667aa0b65257abc3dd520b0
+Subproject 351972396392c97a659b9a02f34ce9269293d21
diff --git a/src/common/x64/cpu_detect.cpp b/src/common/x64/cpu_detect.cpp
index 370ae2c80..2cb3ab9cc 100644
--- a/src/common/x64/cpu_detect.cpp
+++ b/src/common/x64/cpu_detect.cpp
@@ -8,9 +8,9 @@
 #include "common/common_types.h"
 #include "cpu_detect.h"
 
-namespace Common {
-
-#ifndef _MSC_VER
+#ifdef _MSC_VER
+#include <intrin.h>
+#else
 
 #if defined(__DragonFly__) || defined(__FreeBSD__)
 // clang-format off
@@ -37,13 +37,15 @@ static inline void __cpuid(int info[4], int function_id) {
 }
 
 #define _XCR_XFEATURE_ENABLED_MASK 0
-static u64 _xgetbv(u32 index) {
+static inline u64 _xgetbv(u32 index) {
     u32 eax, edx;
     __asm__ __volatile__("xgetbv" : "=a"(eax), "=d"(edx) : "c"(index));
     return ((u64)edx << 32) | eax;
 }
 
-#endif // ifndef _MSC_VER
+#endif // _MSC_VER
+
+namespace Common {
 
 // Detects the various CPU features
 static CPUCaps Detect() {
diff --git a/src/core/hle/service/cfg/cfg.cpp b/src/core/hle/service/cfg/cfg.cpp
index 6f13cde27..4ddb1bc90 100644
--- a/src/core/hle/service/cfg/cfg.cpp
+++ b/src/core/hle/service/cfg/cfg.cpp
@@ -3,6 +3,8 @@
 // Refer to the license.txt file included.
 
 #include <algorithm>
+#include <array>
+#include <cryptopp/sha.h>
 #include "common/file_util.h"
 #include "common/logging/log.h"
 #include "common/string_util.h"
@@ -176,14 +178,29 @@ void SecureInfoGetRegion(Service::Interface* self) {
 }
 
 void GenHashConsoleUnique(Service::Interface* self) {
-    u32* cmd_buff = Kernel::GetCommandBuffer();
-    u32 app_id_salt = cmd_buff[1];
-
-    cmd_buff[1] = RESULT_SUCCESS.raw;
-    cmd_buff[2] = 0x33646D6F ^ (app_id_salt & 0xFFFFF); // 3dmoo hash
-    cmd_buff[3] = 0x6F534841 ^ (app_id_salt & 0xFFFFF);
+    IPC::RequestParser rp(Kernel::GetCommandBuffer(), 0x03, 1, 0);
+    const u32 app_id_salt = rp.Pop<u32>() & 0x000FFFFF;
+
+    IPC::RequestBuilder rb = rp.MakeBuilder(3, 0);
+
+    std::array<u8, 12> buffer;
+    const ResultCode result = GetConfigInfoBlock(ConsoleUniqueID2BlockID, 8, 2, buffer.data());
+    rb.Push(result);
+    if (result.IsSuccess()) {
+        std::memcpy(&buffer[8], &app_id_salt, sizeof(u32));
+        std::array<u8, CryptoPP::SHA256::DIGESTSIZE> hash;
+        CryptoPP::SHA256().CalculateDigest(hash.data(), buffer.data(), sizeof(buffer));
+        u32 low, high;
+        memcpy(&low, &hash[hash.size() - 8], sizeof(u32));
+        memcpy(&high, &hash[hash.size() - 4], sizeof(u32));
+        rb.Push(low);
+        rb.Push(high);
+    } else {
+        rb.Push<u32>(0);
+        rb.Push<u32>(0);
+    }
 
-    LOG_WARNING(Service_CFG, "(STUBBED) called app_id_salt=0x%X", app_id_salt);
+    LOG_DEBUG(Service_CFG, "called app_id_salt=0x%X", app_id_salt);
 }
 
 void GetRegionCanadaUSA(Service::Interface* self) {