Browse Source
Merge pull request #4494 from lioncash/transcode
aes_util: Make use of non-template variant of Transcode
pull/15/merge
bunnei
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
3 additions and
3 deletions
-
src/core/crypto/aes_util.cpp
-
src/core/crypto/partition_data_manager.cpp
|
|
|
@ -116,7 +116,7 @@ void AESCipher<Key, KeySize>::XTSTranscode(const u8* src, std::size_t size, u8* |
|
|
|
|
|
|
|
for (std::size_t i = 0; i < size; i += sector_size) { |
|
|
|
SetIV(CalculateNintendoTweak(sector_id++)); |
|
|
|
Transcode<u8, u8>(src + i, sector_size, dest + i, op); |
|
|
|
Transcode(src + i, sector_size, dest + i, op); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@ -367,8 +367,8 @@ static bool AttemptDecrypt(const std::array<u8, 16>& key, Package2Header& header |
|
|
|
Package2Header temp = header; |
|
|
|
AESCipher<Key128> cipher(key, Mode::CTR); |
|
|
|
cipher.SetIV(header.header_ctr); |
|
|
|
cipher.Transcode(&temp.header_ctr, sizeof(Package2Header) - 0x100, &temp.header_ctr, |
|
|
|
Op::Decrypt); |
|
|
|
cipher.Transcode(&temp.header_ctr, sizeof(Package2Header) - sizeof(Package2Header::signature), |
|
|
|
&temp.header_ctr, Op::Decrypt); |
|
|
|
if (temp.magic == Common::MakeMagic('P', 'K', '2', '1')) { |
|
|
|
header = temp; |
|
|
|
return true; |
|
|
|
|