The-Homebrew-Cloud/nusdownloader-fork
2
0
Fork 0
mirror of https://github.com/WiiDatabase/nusdownloader.git synced 2024-11-27 04:34:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

DSi Decryption fix

Browse Source
This commit is contained in:
givememystuffplease 2011-01-13 23:45:09 +00:00
parent f6533f0afe
commit 6e9d496d41
5 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
NUS Downloader/CommonKey.cs
View File

@ -21,6 +21,7 @@ namespace libWiiSharp
{ {
private static string standardKey = "ebe42a225e8593e448d9c5457381aaf7"; private static string standardKey = "ebe42a225e8593e448d9c5457381aaf7";
private static string koreanKey = "63b82bb4f4614e2e13f2fefbba4c9b7e"; private static string koreanKey = "63b82bb4f4614e2e13f2fefbba4c9b7e";
private static string dsiKey = "af1bf516a807d21aea45984f04742861";
public static byte[] GetStandardKey() public static byte[] GetStandardKey()
{ {
@ -31,5 +32,10 @@ namespace libWiiSharp
{ {
return Shared.HexStringToByteArray(koreanKey); return Shared.HexStringToByteArray(koreanKey);
} }
public static byte[] GetDSiKey()
{
return Shared.HexStringToByteArray(dsiKey);
}
} }
} }

1
NUS Downloader/Form1.cs
View File

@ -99,7 +99,6 @@ namespace NUS_Downloader
public Form1(string[] args) public Form1(string[] args)
{ {
InitializeComponent(); InitializeComponent();
//Application.DoEvents();
Debug.WriteLine("CLI Parameters passed"); Debug.WriteLine("CLI Parameters passed");
GUISetup(); GUISetup();

BIN
NUS Downloader/Latest/NUS Downloader.exe
View File

Binary file not shown.

10
NUS Downloader/NusClient.cs
View File

@ -371,10 +371,15 @@ namespace libWiiSharp
// Parse Ticket // Parse Ticket
Ticket tik = new Ticket(); Ticket tik = new Ticket();
if (File.Exists(Path.Combine(outputDir, "cetk"))) if (File.Exists(Path.Combine(outputDir, "cetk")))
{ {
fireDebug(" Parsing Ticket..."); fireDebug(" Parsing Ticket...");
tik = Ticket.Load(Path.Combine(outputDir, "cetk")); tik = Ticket.Load(Path.Combine(outputDir, "cetk"));
// DSi ticket? Must make sure to use DSi Key :D
if (nusUrl == DSI_NUS_URL)
tik.DSiTicket = true;
} }
else else
{ {
@ -420,7 +425,10 @@ namespace libWiiSharp
//Check SHA1 //Check SHA1
byte[] newSha = s.ComputeHash(decryptedContent); byte[] newSha = s.ComputeHash(decryptedContent);
if (!Shared.CompareByteArrays(newSha, tmd.Contents[i].Hash)) if (!Shared.CompareByteArrays(newSha, tmd.Contents[i].Hash))
{ fireDebug(@"/!\ /!\ Hashes do not match /!\ /!\"); throw new Exception(string.Format("Content #{0}: Hashes do not match!", i)); } {
fireDebug(@"/!\ /!\ Hashes do not match /!\ /!\");
//throw new Exception(string.Format("Content #{0}: Hashes do not match!", i));
}
//Write Decrypted Content //Write Decrypted Content
File.WriteAllBytes(Path.Combine(outputDir, (tmd.Contents[i].ContentID.ToString("x8") + ".app")), decryptedContent); File.WriteAllBytes(Path.Combine(outputDir, (tmd.Contents[i].ContentID.ToString("x8") + ".app")), decryptedContent);

22
NUS Downloader/Ticket.cs
View File

@ -58,6 +58,8 @@ namespace libWiiSharp
private uint timeLimit; private uint timeLimit;
private byte[] padding4 = new byte[88]; private byte[] padding4 = new byte[88];
private bool dsitik = false;
/// <summary> /// <summary>
/// The Title Key the WADs content is encrypted with. /// The Title Key the WADs content is encrypted with.
/// </summary> /// </summary>
@ -91,6 +93,11 @@ namespace libWiiSharp
/// </summary> /// </summary>
public bool TitleKeyChanged { get { return titleKeyChanged; } } public bool TitleKeyChanged { get { return titleKeyChanged; } }
/// <summary>
/// If true, the Ticket will utilize the DSi CommonKey.
/// </summary>
public bool DSiTicket { get { return dsitik; } set { dsitik = value; decryptTitleKey(); } }
#region IDisposable Members #region IDisposable Members
private bool isDisposed = false; private bool isDisposed = false;
@ -532,7 +539,14 @@ namespace libWiiSharp
private void decryptTitleKey() private void decryptTitleKey()
{ {
byte[] ckey = (commonKeyIndex == 0x01) ? CommonKey.GetKoreanKey() : CommonKey.GetStandardKey(); byte[] ckey;
if (dsitik)
{
Console.WriteLine("dsi key in ya house!");
ckey = CommonKey.GetDSiKey();
}
else
ckey = (commonKeyIndex == 0x01) ? CommonKey.GetKoreanKey() : CommonKey.GetStandardKey();
byte[] iv = BitConverter.GetBytes(Shared.Swap(titleId)); byte[] iv = BitConverter.GetBytes(Shared.Swap(titleId));
Array.Resize(ref iv, 16); Array.Resize(ref iv, 16);
@ -560,7 +574,11 @@ namespace libWiiSharp
private void encryptTitleKey() private void encryptTitleKey()
{ {
commonKeyIndex = newKeyIndex; commonKeyIndex = newKeyIndex;
byte[] ckey = (commonKeyIndex == 0x01) ? CommonKey.GetKoreanKey() : CommonKey.GetStandardKey(); byte[] ckey;
if (dsitik)
ckey = CommonKey.GetDSiKey();
else
ckey = (commonKeyIndex == 0x01) ? CommonKey.GetKoreanKey() : CommonKey.GetStandardKey();
byte[] iv = BitConverter.GetBytes(Shared.Swap(titleId)); byte[] iv = BitConverter.GetBytes(Shared.Swap(titleId));
Array.Resize(ref iv, 16); Array.Resize(ref iv, 16);