summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar Lioncash2018-10-13 09:23:34 -0400
committerGravatar Lioncash2018-10-13 09:24:41 -0400
commite0c76226ad3a100637348d822d2c5d7047f78bda (patch)
tree1848d7c0e25ba3baa5a4a33d28345b71ae151825 /src
parentpartition_data_manager: Move IV data to where it's needed in DecryptPackage2() (diff)
downloadyuzu-e0c76226ad3a100637348d822d2c5d7047f78bda.tar.gz
yuzu-e0c76226ad3a100637348d822d2c5d7047f78bda.tar.xz
yuzu-e0c76226ad3a100637348d822d2c5d7047f78bda.zip
partition_data_manager: Take package2_keys by const reference
These are only ever read from, so we don't need to make a copy of all the keys here.
Diffstat (limited to 'src')
-rw-r--r--src/core/crypto/partition_data_manager.cpp2
-rw-r--r--src/core/crypto/partition_data_manager.h3
2 files changed, 3 insertions, 2 deletions
diff --git a/src/core/crypto/partition_data_manager.cpp b/src/core/crypto/partition_data_manager.cpp
index e364affba..6862a0884 100644
--- a/src/core/crypto/partition_data_manager.cpp
+++ b/src/core/crypto/partition_data_manager.cpp
@@ -447,7 +447,7 @@ bool AttemptDecrypt(const std::array<u8, 16>& key, Package2Header& header) {
447 return false; 447 return false;
448} 448}
449 449
450void PartitionDataManager::DecryptPackage2(std::array<std::array<u8, 16>, 0x20> package2_keys, 450void PartitionDataManager::DecryptPackage2(const std::array<Key128, 0x20>& package2_keys,
451 Package2Type type) { 451 Package2Type type) {
452 FileSys::VirtualFile file = std::make_shared<FileSys::OffsetVfsFile>( 452 FileSys::VirtualFile file = std::make_shared<FileSys::OffsetVfsFile>(
453 package2[static_cast<size_t>(type)], 453 package2[static_cast<size_t>(type)],
diff --git a/src/core/crypto/partition_data_manager.h b/src/core/crypto/partition_data_manager.h
index 9e448f720..0ad007c72 100644
--- a/src/core/crypto/partition_data_manager.h
+++ b/src/core/crypto/partition_data_manager.h
@@ -60,7 +60,8 @@ public:
60 // Package2 60 // Package2
61 bool HasPackage2(Package2Type type = Package2Type::NormalMain) const; 61 bool HasPackage2(Package2Type type = Package2Type::NormalMain) const;
62 FileSys::VirtualFile GetPackage2Raw(Package2Type type = Package2Type::NormalMain) const; 62 FileSys::VirtualFile GetPackage2Raw(Package2Type type = Package2Type::NormalMain) const;
63 void DecryptPackage2(std::array<std::array<u8, 16>, 0x20> package2, Package2Type type); 63 void DecryptPackage2(const std::array<std::array<u8, 16>, 0x20>& package2_keys,
64 Package2Type type);
64 const std::vector<u8>& GetPackage2FSDecompressed( 65 const std::vector<u8>& GetPackage2FSDecompressed(
65 Package2Type type = Package2Type::NormalMain) const; 66 Package2Type type = Package2Type::NormalMain) const;
66 std::array<u8, 0x10> GetKeyAreaKeyApplicationSource( 67 std::array<u8, 0x10> GetKeyAreaKeyApplicationSource(