diff options
author | wwylele <wwylele@gmail.com> | 2017-03-12 09:13:32 +0100 |
---|---|---|
committer | wwylele <wwylele@gmail.com> | 2017-03-12 11:24:57 +0100 |
commit | 363f36b904dc67e0455587644d41630e4a3fb9d6 (patch) | |
tree | 4f5a5d8c524ef8e2bfc86a14b0731dd1a20e8c8a /src/core/hle/service/cfg/cfg.cpp | |
parent | Merge pull request #2614 from Schplee/patch-1 (diff) | |
download | yuzu-363f36b904dc67e0455587644d41630e4a3fb9d6.tar yuzu-363f36b904dc67e0455587644d41630e4a3fb9d6.tar.gz yuzu-363f36b904dc67e0455587644d41630e4a3fb9d6.tar.bz2 yuzu-363f36b904dc67e0455587644d41630e4a3fb9d6.tar.lz yuzu-363f36b904dc67e0455587644d41630e4a3fb9d6.tar.xz yuzu-363f36b904dc67e0455587644d41630e4a3fb9d6.tar.zst yuzu-363f36b904dc67e0455587644d41630e4a3fb9d6.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/hle/service/cfg/cfg.cpp | 31 |
1 files changed, 24 insertions, 7 deletions
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) { |