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 r301 WiFiコネクションIDが仮の値であればWiFi設定は移行しないように(TWL修理に準拠)

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@308 385bec56-5757-e545-9c3a-d8741f4650f1
This commit is contained in:
N2614 2011-06-03 05:09:21 +00:00
parent 6904d77e61
commit 7540f46573
1 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -735,16 +735,37 @@ nn::Result ImportNorData()
&reinterpret_cast<common::NtrNorData*>(buf)->ntrConfig.ncd_ex); &reinterpret_cast<common::NtrNorData*>(buf)->ntrConfig.ncd_ex);
COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result); COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
// TWL WiFi設定 // WiFiコネクションIDが仮の値であればWiFi設定は移行しない
result = nn::cfg::nor::CTR::WriteTwlWifiSetting(0, reinterpret_cast<common::NtrNorData*>(buf)->TwlWiFiSetting, // TWL修理に準拠している
common::TWL_WIFI_SETTING_SIZE); u64 attestedUserId1;
COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result); u64 attestedUserId2;
const u32 WIFI_CONNECTION_USERID_OFFSET1 = 0xf0;
const u32 WIFI_CONNECTION_USERID_OFFSET2 = 0x1f0;
const u32 USERID_SIZE = 6;
const bit64 USERID_MASK = 0x07ffffffffffffff;
// NTR WiFi設定 std::memcpy(&attestedUserId1,
result = nn::cfg::nor::CTR::WriteNtrWifiSetting(0, reinterpret_cast<common::NtrNorData*>(buf)->NtrWiFiSetting, &reinterpret_cast<common::NtrNorData*> (buf)->NtrWiFiSetting[WIFI_CONNECTION_USERID_OFFSET1],
common::NTR_WIFI_SETTING_SIZE); USERID_SIZE);
COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result); attestedUserId1 &= USERID_MASK;
std::memcpy(&attestedUserId2,
&reinterpret_cast<common::NtrNorData*> (buf)->NtrWiFiSetting[WIFI_CONNECTION_USERID_OFFSET2],
USERID_SIZE);
attestedUserId2 &= USERID_MASK;
if (attestedUserId1 == attestedUserId2 && attestedUserId1 != 0)
{
// TWL WiFi設定
result = nn::cfg::nor::CTR::WriteTwlWifiSetting(0,
reinterpret_cast<common::NtrNorData*> (buf)->TwlWiFiSetting, common::TWL_WIFI_SETTING_SIZE);
COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
// NTR WiFi設定
result = nn::cfg::nor::CTR::WriteNtrWifiSetting(0,
reinterpret_cast<common::NtrNorData*> (buf)->NtrWiFiSetting, common::NTR_WIFI_SETTING_SIZE);
COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
}
} }
common::HeapManager::GetHeap()->Free(buf); common::HeapManager::GetHeap()->Free(buf);