diff options
| author | shuffle2 <godisgovernment@gmail.com> | 2015-10-03 18:00:58 -0700 |
|---|---|---|
| committer | shuffle2 <godisgovernment@gmail.com> | 2015-10-03 18:00:58 -0700 |
| commit | a6f04b0e15af9ce261cc5bb190eb60a2bbaee804 (patch) | |
| tree | 233f28f1b4df9566667013f47c5e9a09920626e9 /Source/Core/DiscIO/VolumeCreator.cpp | |
| parent | 8bb35c85887eaef35ddcb7dfaae394f7d1165fe1 (diff) | |
| parent | f6795466e767ee11e3f2c7d93c8f51abeabd29af (diff) | |
Merge pull request #3091 from Tilka/mbedtls
Update mbed TLS (PolarSSL)
Diffstat (limited to 'Source/Core/DiscIO/VolumeCreator.cpp')
| -rw-r--r-- | Source/Core/DiscIO/VolumeCreator.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/Core/DiscIO/VolumeCreator.cpp b/Source/Core/DiscIO/VolumeCreator.cpp index 4b3e90e2d0..66ee188d9c 100644 --- a/Source/Core/DiscIO/VolumeCreator.cpp +++ b/Source/Core/DiscIO/VolumeCreator.cpp @@ -9,7 +9,7 @@ #include <utility> #include <vector> -#include <polarssl/aes.h> +#include <mbedtls/aes.h> #include "Common/CommonTypes.h" #include "Common/StringUtil.h" @@ -139,10 +139,10 @@ void VolumeKeyForPartition(IBlobReader& _rReader, u64 offset, u8* VolumeKey) if (Reader.Read8(0x3) == 'K' && Reader.Read8(offset + 0x1f1) == 1) usingKoreanKey = true; - aes_context AES_ctx; - aes_setkey_dec(&AES_ctx, (usingKoreanKey ? s_master_key_korean : s_master_key), 128); + mbedtls_aes_context AES_ctx; + mbedtls_aes_setkey_dec(&AES_ctx, (usingKoreanKey ? s_master_key_korean : s_master_key), 128); - aes_crypt_cbc(&AES_ctx, AES_DECRYPT, 16, IV, SubKey, VolumeKey); + mbedtls_aes_crypt_cbc(&AES_ctx, MBEDTLS_AES_DECRYPT, 16, IV, SubKey, VolumeKey); } static IVolume* CreateVolumeFromCryptedWiiImage(std::unique_ptr<IBlobReader> reader, u32 _PartitionGroup, u32 _VolumeType, u32 _VolumeNum) |