From 88bd021a1f8f5585e0c5ee9323398258aad78710 Mon Sep 17 00:00:00 2001 From: N2614 Date: Fri, 3 Jun 2011 10:44:50 +0000 Subject: [PATCH] =?UTF-8?q?WiFi=E3=82=B3=E3=83=8D=E3=82=AF=E3=82=B7?= =?UTF-8?q?=E3=83=A7=E3=83=B3ID=E8=A8=88=E7=AE=97=E3=81=AE=E3=83=93?= =?UTF-8?q?=E3=83=83=E3=83=88=E3=83=9E=E3=82=B9=E3=82=AF=E3=81=AE=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_Repair@311 385bec56-5757-e545-9c3a-d8741f4650f1 --- .../sources/ConsoleRestore/Importer.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp index 6f22326..7109698 100644 --- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp +++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp @@ -751,20 +751,22 @@ nn::Result ImportNorData() // WiFiコネクションIDが仮の値であればWiFi設定は移行しない // TWL修理に準拠している - u64 attestedUserId1; - u64 attestedUserId2; + u64 attestedUserId1 = 0; + u64 attestedUserId2 = 0; const u32 WIFI_CONNECTION_USERID_OFFSET1 = 0xf0; const u32 WIFI_CONNECTION_USERID_OFFSET2 = 0x1f0; const u32 USERID_SIZE = 6; - const bit64 USERID_MASK = 0x07ffffffffffffff; + const bit64 USERID_MASK = 0x7FFFFFFFFFF; // 43bit + + void* NtrWifiSettingAddr = &reinterpret_cast(buf)->NtrWiFiSetting; std::memcpy(&attestedUserId1, - &reinterpret_cast (buf)->NtrWiFiSetting[WIFI_CONNECTION_USERID_OFFSET1], + &reinterpret_cast(NtrWifiSettingAddr)[WIFI_CONNECTION_USERID_OFFSET1], USERID_SIZE); attestedUserId1 &= USERID_MASK; std::memcpy(&attestedUserId2, - &reinterpret_cast (buf)->NtrWiFiSetting[WIFI_CONNECTION_USERID_OFFSET2], + &reinterpret_cast(NtrWifiSettingAddr)[WIFI_CONNECTION_USERID_OFFSET2], USERID_SIZE); attestedUserId2 &= USERID_MASK;