diff options
| author | flacs <tilkax@gmail.com> | 2015-09-01 04:09:05 +0200 |
|---|---|---|
| committer | flacs <tilkax@gmail.com> | 2015-09-01 04:09:05 +0200 |
| commit | 0ba7a65f08783635a0fa73d3e435ef8c8d345c4b (patch) | |
| tree | 74471f02057b0b5a526eaf15527b2ea9e64dfa6e /Source/Core/DiscIO/VolumeWiiCrypted.cpp | |
| parent | b9ea9c05ad8287462cfbbc1c19620f98f9eaad26 (diff) | |
| parent | 222b33f0a39d9be4f7b4fe96e4b9babbdebeb38f (diff) | |
Merge pull request #2932 from lioncash/disc
VolumeCreator: Use a unique_ptr in CreateVolumeFromFilename
Diffstat (limited to 'Source/Core/DiscIO/VolumeWiiCrypted.cpp')
| -rw-r--r-- | Source/Core/DiscIO/VolumeWiiCrypted.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Source/Core/DiscIO/VolumeWiiCrypted.cpp b/Source/Core/DiscIO/VolumeWiiCrypted.cpp index 5701dab1cc..a6ec5a6e33 100644 --- a/Source/Core/DiscIO/VolumeWiiCrypted.cpp +++ b/Source/Core/DiscIO/VolumeWiiCrypted.cpp @@ -5,7 +5,9 @@ #include <cstddef> #include <cstring> #include <map> +#include <memory> #include <string> +#include <utility> #include <vector> #include <polarssl/aes.h> #include <polarssl/sha1.h> @@ -25,9 +27,9 @@ namespace DiscIO { -CVolumeWiiCrypted::CVolumeWiiCrypted(IBlobReader* _pReader, u64 _VolumeOffset, +CVolumeWiiCrypted::CVolumeWiiCrypted(std::unique_ptr<IBlobReader> reader, u64 _VolumeOffset, const unsigned char* _pVolumeKey) - : m_pReader(_pReader), + : m_pReader(std::move(reader)), m_AES_ctx(new aes_context), m_pBuffer(nullptr), m_VolumeOffset(_VolumeOffset), @@ -44,7 +46,7 @@ bool CVolumeWiiCrypted::ChangePartition(u64 offset) m_LastDecryptedBlockOffset = -1; u8 volume_key[16]; - DiscIO::VolumeKeyForParition(*m_pReader, offset, volume_key); + DiscIO::VolumeKeyForPartition(*m_pReader, offset, volume_key); aes_setkey_dec(m_AES_ctx.get(), volume_key, 128); return true; } |