From 2fa3a7bfa15d4eb21247b1547428fd3cc8ec0378 Mon Sep 17 00:00:00 2001 From: Evan Husted Date: Fri, 20 Dec 2024 15:44:01 -0600 Subject: [PATCH] HLE: rename AmiiboDecrypter to AmiiboDecryptor --- .../HOS/Services/Nfc/AmiiboDecryption/AmiiboBinReader.cs | 6 +++--- .../{AmiiboDecrypter.cs => AmiiboDecryptor.cs} | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) rename src/Ryujinx.HLE/HOS/Services/Nfc/AmiiboDecryption/{AmiiboDecrypter.cs => AmiiboDecryptor.cs} (77%) diff --git a/src/Ryujinx.HLE/HOS/Services/Nfc/AmiiboDecryption/AmiiboBinReader.cs b/src/Ryujinx.HLE/HOS/Services/Nfc/AmiiboDecryption/AmiiboBinReader.cs index a0b8b5414..65638b04e 100644 --- a/src/Ryujinx.HLE/HOS/Services/Nfc/AmiiboDecryption/AmiiboBinReader.cs +++ b/src/Ryujinx.HLE/HOS/Services/Nfc/AmiiboDecryption/AmiiboBinReader.cs @@ -41,7 +41,7 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.AmiiboDecryption fileBytes = newFileBytes; } - AmiiboDecrypter amiiboDecryptor = new AmiiboDecrypter(keyRetailBinPath); + AmiiboDecryptor amiiboDecryptor = new(keyRetailBinPath); AmiiboDump amiiboDump = amiiboDecryptor.DecryptAmiiboDump(fileBytes); byte[] titleId = new byte[8]; @@ -182,7 +182,7 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.AmiiboDecryption readBytes = newFileBytes; } - AmiiboDecrypter amiiboDecryptor = new AmiiboDecrypter(keyRetailBinPath); + AmiiboDecryptor amiiboDecryptor = new AmiiboDecryptor(keyRetailBinPath); AmiiboDump amiiboDump = amiiboDecryptor.DecryptAmiiboDump(readBytes); byte[] oldData = amiiboDump.GetData(); @@ -250,7 +250,7 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.AmiiboDecryption readBytes = newFileBytes; } - AmiiboDecrypter amiiboDecryptor = new AmiiboDecrypter(keyRetailBinPath); + AmiiboDecryptor amiiboDecryptor = new AmiiboDecryptor(keyRetailBinPath); AmiiboDump amiiboDump = amiiboDecryptor.DecryptAmiiboDump(readBytes); amiiboDump.AmiiboNickname = newNickName; byte[] oldData = amiiboDump.GetData(); diff --git a/src/Ryujinx.HLE/HOS/Services/Nfc/AmiiboDecryption/AmiiboDecrypter.cs b/src/Ryujinx.HLE/HOS/Services/Nfc/AmiiboDecryption/AmiiboDecryptor.cs similarity index 77% rename from src/Ryujinx.HLE/HOS/Services/Nfc/AmiiboDecryption/AmiiboDecrypter.cs rename to src/Ryujinx.HLE/HOS/Services/Nfc/AmiiboDecryption/AmiiboDecryptor.cs index 71758c947..cc6d02ea2 100644 --- a/src/Ryujinx.HLE/HOS/Services/Nfc/AmiiboDecryption/AmiiboDecrypter.cs +++ b/src/Ryujinx.HLE/HOS/Services/Nfc/AmiiboDecryption/AmiiboDecryptor.cs @@ -2,12 +2,12 @@ using System.IO; namespace Ryujinx.HLE.HOS.Services.Nfc.AmiiboDecryption { - public class AmiiboDecrypter + public class AmiiboDecryptor { public AmiiboMasterKey DataKey { get; private set; } public AmiiboMasterKey TagKey { get; private set; } - public AmiiboDecrypter(string keyRetailBinPath) + public AmiiboDecryptor(string keyRetailBinPath) { var combinedKeys = File.ReadAllBytes(keyRetailBinPath); var keys = AmiiboMasterKey.FromCombinedBin(combinedKeys); @@ -18,7 +18,7 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.AmiiboDecryption public AmiiboDump DecryptAmiiboDump(byte[] encryptedDumpData) { // Initialize AmiiboDump with encrypted data - AmiiboDump amiiboDump = new AmiiboDump(encryptedDumpData, DataKey, TagKey, isLocked: true); + AmiiboDump amiiboDump = new(encryptedDumpData, DataKey, TagKey, isLocked: true); // Unlock (decrypt) the dump amiiboDump.Unlock(); @@ -32,7 +32,7 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.AmiiboDecryption public AmiiboDump EncryptAmiiboDump(byte[] decryptedDumpData) { // Initialize AmiiboDump with decrypted data - AmiiboDump amiiboDump = new AmiiboDump(decryptedDumpData, DataKey, TagKey, isLocked: false); + AmiiboDump amiiboDump = new(decryptedDumpData, DataKey, TagKey, isLocked: false); // Lock (encrypt) the dump amiiboDump.Lock();