rvtr/ctr_Repair
1
Fork 0
mirror of https://github.com/rvtr/ctr_Repair.git synced 2025-10-31 13:51:08 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

trunk r311 WiFiコネクションID計算のビットマスクの修正 をマージ

Browse Source 
git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_Repair@312 385bec56-5757-e545-9c3a-d8741f4650f1
This commit is contained in:
N2614 2011-06-03 10:46:01 +00:00
parent 88bd021a1f
commit 20dbb4dc74
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
branches/0thNUP_No_NUP/ConsoleDataMigration/ConsoleRestore/Importer.cpp
View File

@ -737,20 +737,22 @@ nn::Result ImportNorData()
// WiFiコネクションIDが仮の値であればWiFi設定は移行しない // WiFiコネクションIDが仮の値であればWiFi設定は移行しない
// TWL修理に準拠している // TWL修理に準拠している
u64 attestedUserId1; u64 attestedUserId1 = 0;
u64 attestedUserId2; u64 attestedUserId2 = 0;
const u32 WIFI_CONNECTION_USERID_OFFSET1 = 0xf0; const u32 WIFI_CONNECTION_USERID_OFFSET1 = 0xf0;
const u32 WIFI_CONNECTION_USERID_OFFSET2 = 0x1f0; const u32 WIFI_CONNECTION_USERID_OFFSET2 = 0x1f0;
const u32 USERID_SIZE = 6; const u32 USERID_SIZE = 6;
const bit64 USERID_MASK = 0x07ffffffffffffff; const bit64 USERID_MASK = 0x7FFFFFFFFFF; // 43bit
void* NtrWifiSettingAddr = &reinterpret_cast<common::NtrNorData*>(buf)->NtrWiFiSetting;
std::memcpy(&attestedUserId1, std::memcpy(&attestedUserId1,
&reinterpret_cast<common::NtrNorData*> (buf)->NtrWiFiSetting[WIFI_CONNECTION_USERID_OFFSET1], &reinterpret_cast<u8*>(NtrWifiSettingAddr)[WIFI_CONNECTION_USERID_OFFSET1],
USERID_SIZE); USERID_SIZE);
attestedUserId1 &= USERID_MASK; attestedUserId1 &= USERID_MASK;
std::memcpy(&attestedUserId2, std::memcpy(&attestedUserId2,
&reinterpret_cast<common::NtrNorData*> (buf)->NtrWiFiSetting[WIFI_CONNECTION_USERID_OFFSET2], &reinterpret_cast<u8*>(NtrWifiSettingAddr)[WIFI_CONNECTION_USERID_OFFSET2],
USERID_SIZE); USERID_SIZE);
attestedUserId2 &= USERID_MASK; attestedUserId2 &= USERID_MASK;