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

Derive key file in a safer way

Browse Source
This commit is contained in:
Matt Nadareski
2024-10-12 01:58:07 -04:00
parent 77407f54fb
commit 08a1dc5e42
1 changed files with 28 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
NDecrypt/Program.cs
View File

@@ -89,16 +89,7 @@ namespace NDecrypt
}
// Derive the keyfile path based on the runtime folder if not already set
if (string.IsNullOrWhiteSpace(decryptArgs.KeyFile))
{
using var processModule = System.Diagnostics.Process.GetCurrentProcess().MainModule;
string applicationDirectory = Path.GetDirectoryName(processModule?.FileName) ?? string.Empty;
if (decryptArgs.UseCitraKeyFile)
decryptArgs.KeyFile = Path.Combine(applicationDirectory, "aes_keys.txt");
else
decryptArgs.KeyFile = Path.Combine(applicationDirectory, "keys.bin");
}
decryptArgs.KeyFile = DeriveKeyFile(decryptArgs.KeyFile, decryptArgs.UseCitraKeyFile);
// If we are using a Citra keyfile, there are no development keys
if (decryptArgs.Development && decryptArgs.UseCitraKeyFile)
@@ -188,6 +179,33 @@ Possible values for [flags] (one or more can be used):
More than one path can be specified at a time.");
}
/// <summary>
/// Derive the full path to the keyfile, if possible
/// </summary>
private static string? DeriveKeyFile(string? keyfile, bool useCitraKeyFile)
{
// If a path is passed in
if (!string.IsNullOrEmpty(keyfile))
{
keyfile = Path.GetFullPath(keyfile);
if (File.Exists(keyfile))
return keyfile;
}
// Derive the keyfile path based on the runtime folder if not already set
using var processModule = System.Diagnostics.Process.GetCurrentProcess().MainModule;
string applicationDirectory = Path.GetDirectoryName(processModule?.FileName) ?? string.Empty;
// Citra has a unique keyfile format
if (useCitraKeyFile)
keyfile = Path.Combine(applicationDirectory, "aes_keys.txt");
else
keyfile = Path.Combine(applicationDirectory, "keys.bin");
// Only return the path if the file exists
return File.Exists(keyfile) ? keyfile : null;
}
/// <summary>
/// Derive the encryption tool to be used for the given file
/// </summary>