diff options
author | Lioncash <mathew1800@gmail.com> | 2018-10-13 14:12:00 +0200 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2018-10-13 14:24:18 +0200 |
commit | ef5639bfbbeb7d83bd66e3faf3e88e4aa1e05a6e (patch) | |
tree | 80c8f1dbccfb4dd33978e317d097befa8886ab74 /src | |
parent | key_manager: Remove unnecessary seek in DeriveSDSeed() (diff) | |
download | yuzu-ef5639bfbbeb7d83bd66e3faf3e88e4aa1e05a6e.tar yuzu-ef5639bfbbeb7d83bd66e3faf3e88e4aa1e05a6e.tar.gz yuzu-ef5639bfbbeb7d83bd66e3faf3e88e4aa1e05a6e.tar.bz2 yuzu-ef5639bfbbeb7d83bd66e3faf3e88e4aa1e05a6e.tar.lz yuzu-ef5639bfbbeb7d83bd66e3faf3e88e4aa1e05a6e.tar.xz yuzu-ef5639bfbbeb7d83bd66e3faf3e88e4aa1e05a6e.tar.zst yuzu-ef5639bfbbeb7d83bd66e3faf3e88e4aa1e05a6e.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/crypto/key_manager.cpp | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/src/core/crypto/key_manager.cpp b/src/core/crypto/key_manager.cpp index 4ade67d23..14d53bef9 100644 --- a/src/core/crypto/key_manager.cpp +++ b/src/core/crypto/key_manager.cpp @@ -147,30 +147,38 @@ boost::optional<Key128> DeriveSDSeed() { "rb+"); if (!save_43.IsOpen()) return boost::none; + const FileUtil::IOFile sd_private( FileUtil::GetUserPath(FileUtil::UserPath::SDMCDir) + "/Nintendo/Contents/private", "rb+"); if (!sd_private.IsOpen()) return boost::none; std::array<u8, 0x10> private_seed{}; - if (sd_private.ReadBytes(private_seed.data(), private_seed.size()) != 0x10) + if (sd_private.ReadBytes(private_seed.data(), private_seed.size()) != private_seed.size()) { return boost::none; + } std::array<u8, 0x10> buffer{}; std::size_t offset = 0; for (; offset + 0x10 < save_43.GetSize(); ++offset) { - save_43.Seek(offset, SEEK_SET); + if (!save_43.Seek(offset, SEEK_SET)) { + return boost::none; + } + save_43.ReadBytes(buffer.data(), buffer.size()); - if (buffer == private_seed) + if (buffer == private_seed) { break; + } } - if (offset + 0x10 >= save_43.GetSize()) + if (!save_43.Seek(offset + 0x10, SEEK_SET)) { return boost::none; + } Key128 seed{}; - save_43.Seek(offset + 0x10, SEEK_SET); - save_43.ReadBytes(seed.data(), seed.size()); + if (save_43.ReadBytes(seed.data(), seed.size()) != seed.size()) { + return boost::none; + } return seed; } @@ -233,7 +241,9 @@ std::vector<TicketRaw> GetTicketblob(const FileUtil::IOFile& ticket_save) { return {}; std::vector<u8> buffer(ticket_save.GetSize()); - ticket_save.ReadBytes(buffer.data(), buffer.size()); + if (ticket_save.ReadBytes(buffer.data(), buffer.size()) != buffer.size()) { + return {}; + } std::vector<TicketRaw> out; u32 magic{}; |