SabreTools/NDecrypt
1
0
Fork 0
mirror of https://github.com/SabreTools/NDecrypt.git synced 2026-09-22 06:45:07 +00:00
Code Issues 11 Packages Projects Releases 20 Wiki Activity

Add force flag for both NDS and N3DS

Browse Source
This commit is contained in:
Matt Nadareski
2020-10-11 23:13:23 -07:00
parent 10fcd51e10
commit b9b8c76e84
6 changed files with 64 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
NDecrypt/DSTool.cs
View File

@@ -16,10 +16,16 @@ namespace NDecrypt
/// </summary>
private readonly bool encrypt;
public DSTool(string filename, bool encrypt)
/// <summary>
/// Flag to determine if forcing operations
/// </summary>
private readonly bool force;
public DSTool(string filename, bool encrypt, bool force)
{
this.filename = filename;
this.encrypt = encrypt;
this.force = force;
}
/// <summary>
@@ -44,7 +50,7 @@ namespace NDecrypt
}
// Process the secure area
header.ProcessSecureArea(reader, writer, encrypt);
header.ProcessSecureArea(reader, writer, encrypt, force);
}
return true;

12
NDecrypt/Headers/NCCHHeader.cs
View File

@@ -255,10 +255,16 @@ namespace NDecrypt.Headers
/// <param name="header">NCSD header representing the 3DS file</param>
/// <param name="encrypt">True if we want to encrypt the partitions, false otherwise</param>
/// <param name="development">True if development keys should be used, false otherwise</param>
public void ProcessPartition(BinaryReader reader, BinaryWriter writer, NCSDHeader header, bool encrypt, bool development)
/// <param name="force">True if we want to force the operation, false otherwise</param>
public void ProcessPartition(BinaryReader reader, BinaryWriter writer, NCSDHeader header, bool encrypt, bool development, bool force)
{
// Check if the 'NoCrypto' bit is set
if (Flags.PossblyDecrypted ^ encrypt)
// If we're forcing the operation, tell the user
if (force)
{
Console.WriteLine($"Partition {PartitionNumber} is not verified due to force flag being set.");
}
// If we're not forcing the operation, check if the 'NoCrypto' bit is set
else if (Flags.PossblyDecrypted ^ encrypt)
{
Console.WriteLine($"Partition {PartitionNumber}: Already " + (encrypt ? "Encrypted" : "Decrypted") + "?...");
return;

5
NDecrypt/Headers/NCSDHeader.cs
View File

@@ -330,7 +330,8 @@ namespace NDecrypt.Headers
/// <param name="writer">BinaryWriter representing the output stream</param>
/// <param name="encrypt">True if we want to encrypt the partitions, false otherwise</param>
/// <param name="development">True if development keys should be used, false otherwise</param>
public void ProcessAllPartitions(BinaryReader reader, BinaryWriter writer, bool encrypt, bool development)
/// <param name="force">True if we want to force the operation, false otherwise</param>
public void ProcessAllPartitions(BinaryReader reader, BinaryWriter writer, bool encrypt, bool development, bool force)
{
// Iterate over all 8 NCCH partitions
for (int p = 0; p < 8; p++)
@@ -339,7 +340,7 @@ namespace NDecrypt.Headers
if (partitionHeader == null)
continue;
partitionHeader.ProcessPartition(reader, writer, this, encrypt, development);
partitionHeader.ProcessPartition(reader, writer, this, encrypt, development, force);
}
}

26
NDecrypt/Headers/NDSHeader.cs
View File

@@ -591,18 +591,28 @@ namespace NDecrypt.Headers
/// <param name="reader">BinaryReader representing the input stream</param>
/// <param name="writer">BinaryWriter representing the output stream</param>
/// <param name="encrypt">True if we want to encrypt the partitions, false otherwise</param>
public void ProcessSecureArea(BinaryReader reader, BinaryWriter writer, bool encrypt)
/// <param name="force">True if we want to force the operation, false otherwise</param>
public void ProcessSecureArea(BinaryReader reader, BinaryWriter writer, bool encrypt, bool force)
{
bool? isDecrypted = CheckIfDecrypted(reader);
if (isDecrypted == null)
// If we're forcing the operation, tell the user
if (force)
{
Console.WriteLine("File has an empty secure area, cannot proceed");
return;
Console.WriteLine("File is not verified due to force flag being set.");
}
else if (encrypt ^ isDecrypted.Value)
// If we're not forcing the operation, check to see if we should be proceeding
else
{
Console.WriteLine("File is already " + (encrypt ? "encrypted" : "decrypted"));
return;
bool? isDecrypted = CheckIfDecrypted(reader);
if (isDecrypted == null)
{
Console.WriteLine("File has an empty secure area, cannot proceed");
return;
}
else if (encrypt ^ isDecrypted.Value)
{
Console.WriteLine("File is already " + (encrypt ? "encrypted" : "decrypted"));
return;
}
}
ProcessARM9(reader, writer, encrypt);

29
NDecrypt/Program.cs
View File

@@ -29,12 +29,18 @@ namespace NDecrypt
return;
}
bool development = false;
bool development = false, force = false;
int start = 1;
if (args[1] == "-dev")
for ( ; start < args.Length; start++)
{
development = true;
start = 2;
if (args[start] == "-dev" || args[start] == "--development")
development = true;
else if (args[start] == "-f" || args[start] == "--force")
force = true;
else
break;
}
// Ensure the constants are all set
@@ -49,7 +55,7 @@ namespace NDecrypt
{
if (File.Exists(args[i]))
{
ITool tool = DeriveTool(args[i], encrypt.Value, development);
ITool tool = DeriveTool(args[i], encrypt.Value, development, force);
if (tool?.ProcessFile() != true)
Console.WriteLine("Processing failed!");
}
@@ -57,7 +63,7 @@ namespace NDecrypt
{
foreach (string file in Directory.EnumerateFiles(args[i], "*", SearchOption.AllDirectories))
{
ITool tool = DeriveTool(file, encrypt.Value, development);
ITool tool = DeriveTool(file, encrypt.Value, development, force);
if (tool?.ProcessFile() != true)
Console.WriteLine("Processing failed!");
}
@@ -77,7 +83,7 @@ namespace NDecrypt
if (!string.IsNullOrWhiteSpace(err))
Console.WriteLine($"Error: {err}");
Console.WriteLine("Usage: NDecrypt.exe (decrypt|encrypt) [-dev] <file|dir> ...");
Console.WriteLine("Usage: NDecrypt.exe (decrypt|encrypt) [-dev] [-f] <file|dir> ...");
}
private enum RomType
@@ -93,18 +99,19 @@ namespace NDecrypt
/// </summary>
/// <param name="filename">Filename to derive the tool from</param>
/// <param name="encrypt">True if we are encrypting the file, false otherwise</param>
/// <param name="development">rue if we are using development keys, false otherwise</param>
/// <param name="development">True if we are using development keys, false otherwise</param>
/// <param name="force">True if operations should be forced, false otherwise</param>
/// <returns></returns>
private static ITool DeriveTool(string filename, bool encrypt, bool development)
private static ITool DeriveTool(string filename, bool encrypt, bool development, bool force)
{
RomType type = DetermineRomType(filename);
switch(type)
{
case RomType.NDS:
case RomType.NDSi:
return new DSTool(filename, encrypt);
return new DSTool(filename, encrypt, force);
case RomType.N3DS:
return new ThreeDSTool(filename, development, encrypt);
return new ThreeDSTool(filename, development, encrypt, force);
case RomType.NULL:
default:
Console.WriteLine($"Unrecognized file format for {filename}. Expected *.nds, *.srl, *.dsi, *.3ds");

10
NDecrypt/ThreeDSTool.cs
View File

@@ -21,11 +21,17 @@ namespace NDecrypt
/// </summary>
private readonly bool encrypt;
public ThreeDSTool(string filename, bool development, bool encrypt)
/// <summary>
/// Flag to determine if forcing operations
/// </summary>
private readonly bool force;
public ThreeDSTool(string filename, bool development, bool encrypt, bool force)
{
this.filename = filename;
this.development = development;
this.encrypt = encrypt;
this.force = force;
}
/// <summary>
@@ -50,7 +56,7 @@ namespace NDecrypt
}
// Process all 8 NCCH partitions
header.ProcessAllPartitions(reader, writer, encrypt, development);
header.ProcessAllPartitions(reader, writer, encrypt, development, force);
}
return true;