diff options
author | Narr the Reg <juangerman-13@hotmail.com> | 2023-06-12 09:17:10 +0200 |
---|---|---|
committer | Narr the Reg <juangerman-13@hotmail.com> | 2023-06-15 02:08:35 +0200 |
commit | b1b13ddc6bdc8d9d67a53a33465f5cf84146a262 (patch) | |
tree | 20898261f367a1b78cbbfa3c13bff48427ffa107 /src/core/hle/service/nfc/common/amiibo_crypto.h | |
parent | Merge pull request #10781 from 8bitDream/vcpkg (diff) | |
download | yuzu-b1b13ddc6bdc8d9d67a53a33465f5cf84146a262.tar yuzu-b1b13ddc6bdc8d9d67a53a33465f5cf84146a262.tar.gz yuzu-b1b13ddc6bdc8d9d67a53a33465f5cf84146a262.tar.bz2 yuzu-b1b13ddc6bdc8d9d67a53a33465f5cf84146a262.tar.lz yuzu-b1b13ddc6bdc8d9d67a53a33465f5cf84146a262.tar.xz yuzu-b1b13ddc6bdc8d9d67a53a33465f5cf84146a262.tar.zst yuzu-b1b13ddc6bdc8d9d67a53a33465f5cf84146a262.zip |
Diffstat (limited to 'src/core/hle/service/nfc/common/amiibo_crypto.h')
-rw-r--r-- | src/core/hle/service/nfc/common/amiibo_crypto.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/core/hle/service/nfc/common/amiibo_crypto.h b/src/core/hle/service/nfc/common/amiibo_crypto.h index bf3044ed9..6a3e0841e 100644 --- a/src/core/hle/service/nfc/common/amiibo_crypto.h +++ b/src/core/hle/service/nfc/common/amiibo_crypto.h @@ -24,10 +24,8 @@ using DrgbOutput = std::array<u8, 0x20>; struct HashSeed { u16_be magic; std::array<u8, 0xE> padding; - NFC::UniqueSerialNumber uid_1; - u8 nintendo_id_1; - NFC::UniqueSerialNumber uid_2; - u8 nintendo_id_2; + TagUuid uid_1; + TagUuid uid_2; std::array<u8, 0x20> keygen_salt; }; static_assert(sizeof(HashSeed) == 0x40, "HashSeed is an invalid size"); @@ -69,9 +67,6 @@ NTAG215File NfcDataToEncodedData(const EncryptedNTAG215File& nfc_data); /// Converts from encoded file format to encrypted file format EncryptedNTAG215File EncodedDataToNfcData(const NTAG215File& encoded_data); -/// Returns password needed to allow write access to protected memory -u32 GetTagPassword(const TagUuid& uuid); - // Generates Seed needed for key derivation HashSeed GetSeed(const NTAG215File& data); |