ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

VolumeCreator: Fix a typo in VolumeKeyForPartition's name

This commit is contained in:
Lioncash 2015-08-31 19:30:32 -04:00
parent 1db1a8aacf
commit 222b33f0a3
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/DiscIO/VolumeCreator.cpp
View File

@ -120,7 +120,7 @@ bool IsVolumeWadFile(const IVolume *_rVolume)
return (Common::swap32(MagicWord) == 0x00204973 || Common::swap32(MagicWord) == 0x00206962); return (Common::swap32(MagicWord) == 0x00204973 || Common::swap32(MagicWord) == 0x00206962);
} }
void VolumeKeyForParition(IBlobReader& _rReader, u64 offset, u8* VolumeKey) void VolumeKeyForPartition(IBlobReader& _rReader, u64 offset, u8* VolumeKey)
{ {
CBlobBigEndianReader Reader(_rReader); CBlobBigEndianReader Reader(_rReader);
@ -192,7 +192,7 @@ static IVolume* CreateVolumeFromCryptedWiiImage(std::unique_ptr<IBlobReader> rea
if ((rPartition.Type == _VolumeType && (int)_VolumeNum == -1) || i == _VolumeNum) if ((rPartition.Type == _VolumeType && (int)_VolumeNum == -1) || i == _VolumeNum)
{ {
u8 VolumeKey[16]; u8 VolumeKey[16];
VolumeKeyForParition(*reader, rPartition.Offset, VolumeKey); VolumeKeyForPartition(*reader, rPartition.Offset, VolumeKey);
return new CVolumeWiiCrypted(std::move(reader), rPartition.Offset, VolumeKey); return new CVolumeWiiCrypted(std::move(reader), rPartition.Offset, VolumeKey);
} }
} }

2
Source/Core/DiscIO/VolumeCreator.h
View File

@ -18,6 +18,6 @@ IVolume* CreateVolumeFromFilename(const std::string& _rFilename, u32 _PartitionG
IVolume* CreateVolumeFromDirectory(const std::string& _rDirectory, bool _bIsWii, const std::string& _rApploader = "", const std::string& _rDOL = ""); IVolume* CreateVolumeFromDirectory(const std::string& _rDirectory, bool _bIsWii, const std::string& _rApploader = "", const std::string& _rDOL = "");
bool IsVolumeWiiDisc(const IVolume *_rVolume); bool IsVolumeWiiDisc(const IVolume *_rVolume);
bool IsVolumeWadFile(const IVolume *_rVolume); bool IsVolumeWadFile(const IVolume *_rVolume);
void VolumeKeyForParition(IBlobReader& _rReader, u64 offset, u8* VolumeKey); void VolumeKeyForPartition(IBlobReader& _rReader, u64 offset, u8* VolumeKey);
} // namespace } // namespace

2
Source/Core/DiscIO/VolumeWiiCrypted.cpp
View File

@ -46,7 +46,7 @@ bool CVolumeWiiCrypted::ChangePartition(u64 offset)
m_LastDecryptedBlockOffset = -1; m_LastDecryptedBlockOffset = -1;
u8 volume_key[16]; 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); aes_setkey_dec(m_AES_ctx.get(), volume_key, 128);
return true; return true;
} }