From e2fa5ce3ab5ad2b1bb3596a809962c40bc166bab Mon Sep 17 00:00:00 2001
From: n2460 <n2460@6b0af911-cb57-b745-895f-eec5701120e1>
Date: Tue, 18 Oct 2011 12:00:42 +0000
Subject: [PATCH] =?UTF-8?q?FalsifyTwlBackup:=E5=BE=A9=E5=8F=B7=E5=89=8D?=
 =?UTF-8?q?=E3=81=AB=E7=AA=81=E3=81=A3=E8=BE=BC=E3=82=93=E3=81=A0=E9=8D=B5?=
 =?UTF-8?q?=E3=81=AE=E5=86=85=E5=AE=B9=E3=82=92=E8=A1=A8=E7=A4=BA=E3=81=99?=
 =?UTF-8?q?=E3=82=8B=E3=82=88=E3=81=86=E4=BF=AE=E6=AD=A3=E3=80=82=20TWLBac?=
 =?UTF-8?q?kupBlock:Release=20=E3=81=AB=E3=81=8A=E3=81=84=E3=81=A6=20XML?=
 =?UTF-8?q?=20=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88=E8=AD=A6=E5=91=8A?=
 =?UTF-8?q?=E7=84=A1=E5=8A=B9=E5=8C=96=E5=BF=98=E3=82=8C=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-09-30%20-%20paladin.7z/paladin/ctr_test_tools@17 6b0af911-cb57-b745-895f-eec5701120e1
---
 .../Windows/FalsifyTwlBackup/Program.cs       | 23 +++++++++++++++----
 .../TWLBackupBlock/TwlBackupBlock.csproj      |  1 +
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/TwlBkpCheck/Windows/FalsifyTwlBackup/Program.cs b/TwlBkpCheck/Windows/FalsifyTwlBackup/Program.cs
index 6adbd58..5ba6a74 100644
--- a/TwlBkpCheck/Windows/FalsifyTwlBackup/Program.cs
+++ b/TwlBkpCheck/Windows/FalsifyTwlBackup/Program.cs
@@ -1089,14 +1089,17 @@ namespace FalsifyTwlBackup
       {
         prop.macKeyData[i] = Convert.ToByte(macKeyString[i], 16);
       }
+      
+      // ファイル名の出力 + 鍵データの dump
+      Console.WriteLine("Twl Backup File : {0}", twlBackupName);
+      Console.Write("Block Key File  : {0}, ", keyName);
+      dumpArray("", prop.keyData);
+      Console.Write("MAC Key Data    : {0}, ", macKeyData);
+      dumpArray("", prop.macKeyData);
 
       // バックアップデータを復号化
       prop.decryptedBlocks = Utility.DecryptBackupData(twlBackupData, prop.keyData);
 
-      Console.WriteLine("Twl Backup Data : {0}", twlBackupName);
-      Console.WriteLine("Block KeyData   : {0}", keyName);
-      Console.WriteLine("MAC Key Data    : {0}", macKeyData);
-
       //==========================================
       // 改ざん＆ファイル出力
       Console.WriteLine("Start ------------");
@@ -1106,5 +1109,17 @@ namespace FalsifyTwlBackup
       Console.WriteLine("Complete  --------");
       Console.WriteLine("Output Dir: {0}", prop.outFolderPath);
     }
+
+    // byte 配列の 16 進表示
+    static void dumpArray(String msg, byte[] array)
+    {
+        Console.Write(msg);
+        foreach (byte b in array)
+        {
+            Console.Write(String.Format("{0,0:X2} ", b));
+        }
+        Console.WriteLine();
+    }
+
   }
 }
diff --git a/TwlBkpCheck/Windows/TWLBackupBlock/TwlBackupBlock.csproj b/TwlBkpCheck/Windows/TWLBackupBlock/TwlBackupBlock.csproj
index 5df42c7..e41b545 100644
--- a/TwlBkpCheck/Windows/TWLBackupBlock/TwlBackupBlock.csproj
+++ b/TwlBkpCheck/Windows/TWLBackupBlock/TwlBackupBlock.csproj
@@ -38,6 +38,7 @@
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <DocumentationFile>document.xml</DocumentationFile>
+    <NoWarn>1591</NoWarn>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />