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

Split some steps for readability

Browse Source
This commit is contained in:
Matt Nadareski
2024-11-14 01:56:06 -05:00
parent c79781a6d7
commit 00ac5e1ca2
2 changed files with 28 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
NDecrypt.Core/DecryptArgs.cs
View File

@@ -21,29 +21,29 @@ namespace NDecrypt.Core
/// <summary>
/// AES Hardware Constant
/// </summary>
public byte[]? AESHardwareConstant { get; private set; }
public byte[] AESHardwareConstant { get; private set; } = [];
#region Retail Keys
/// <summary>
/// KeyX 0x18 (New 3DS 9.3)
/// </summary>
public byte[]? KeyX0x18 { get; private set; }
public byte[] KeyX0x18 { get; private set; } = [];
/// <summary>
/// KeyX 0x1B (New 3DS 9.6)
/// </summary>
public byte[]? KeyX0x1B { get; private set; }
public byte[] KeyX0x1B { get; private set; } = [];
/// <summary>
/// KeyX 0x25 (> 7.x)
/// </summary>
public byte[]? KeyX0x25 { get; private set; }
public byte[] KeyX0x25 { get; private set; } = [];
/// <summary>
/// KeyX 0x2C (< 6.x)
/// </summary>
public byte[]? KeyX0x2C { get; private set; }
public byte[] KeyX0x2C { get; private set; } = [];
#endregion
@@ -52,22 +52,22 @@ namespace NDecrypt.Core
/// <summary>
/// Dev KeyX 0x18 (New 3DS 9.3)
/// </summary>
public byte[]? DevKeyX0x18 { get; private set; }
public byte[] DevKeyX0x18 { get; private set; } = [];
/// <summary>
/// Dev KeyX 0x1B New 3DS 9.6)
/// </summary>
public byte[]? DevKeyX0x1B { get; private set; }
public byte[] DevKeyX0x1B { get; private set; } = [];
/// <summary>
/// Dev KeyX 0x25 (> 7.x)
/// </summary>
public byte[]? DevKeyX0x25 { get; private set; }
public byte[] DevKeyX0x25 { get; private set; } = [];
/// <summary>
/// Dev KeyX 0x2C (< 6.x)
/// </summary>
public byte[]? DevKeyX0x2C { get; private set; }
public byte[] DevKeyX0x2C { get; private set; } = [];
#endregion

27
NDecrypt.Core/PartitionKeys.cs
View File

@@ -10,15 +10,15 @@ namespace NDecrypt.Core
/// </summary>
public class PartitionKeys
{
public byte[]? KeyX { get; private set; }
public byte[] KeyX { get; private set; }
public byte[]? KeyX2C { get; private set; }
public byte[] KeyX2C { get; }
public byte[]? KeyY { get; private set; }
public byte[] KeyY { get; }
public byte[]? NormalKey { get; private set; }
public byte[] NormalKey { get; private set; }
public byte[]? NormalKey2C { get; private set; }
public byte[] NormalKey2C { get; }
/// <summary>
/// Decryption args to use while processing
@@ -61,7 +61,11 @@ namespace NDecrypt.Core
// Set the standard normal key values
NormalKey = new byte[16];
NormalKey2C = RotateLeft(Add(Xor(RotateLeft(KeyX2C!, 2), KeyY), args.AESHardwareConstant!), 87);
NormalKey2C = RotateLeft(KeyX2C!, 2);
NormalKey2C = Xor(NormalKey2C, KeyY);
NormalKey2C = Add(NormalKey2C, args.AESHardwareConstant);
NormalKey2C = RotateLeft(NormalKey2C, 87);
// Special case for zero-key
if (masks.HasFlag(BitMasks.FixedCryptoKey))
@@ -97,7 +101,10 @@ namespace NDecrypt.Core
}
// Set the normal key based on the new KeyX value
NormalKey = RotateLeft(Add(Xor(RotateLeft(KeyX!, 2), KeyY), args.AESHardwareConstant!), 87);
NormalKey = RotateLeft(KeyX!, 2);
NormalKey = Xor(NormalKey, KeyY);
NormalKey = Add(NormalKey, args.AESHardwareConstant);
NormalKey = RotateLeft(NormalKey, 87);
}
/// <summary>
@@ -114,7 +121,11 @@ namespace NDecrypt.Core
// Encrypting RomFS for partitions 1 and up always use Key0x2C
KeyX = _development ? _decryptArgs.DevKeyX0x2C : _decryptArgs.KeyX0x2C;
NormalKey = RotateLeft(Add(Xor(RotateLeft(KeyX!, 2), KeyY!), _decryptArgs.AESHardwareConstant!), 87);
NormalKey = RotateLeft(KeyX!, 2);
NormalKey = Xor(NormalKey, KeyY);
NormalKey = Add(NormalKey, _decryptArgs.AESHardwareConstant);
NormalKey = RotateLeft(NormalKey, 87);
}
}
}