summaryrefslogtreecommitdiff
path: root/Source/Core/DiscIO/NANDContentLoader.cpp
diff options
context:
space:
mode:
authorshuffle2 <godisgovernment@gmail.com>2015-10-03 18:00:58 -0700
committershuffle2 <godisgovernment@gmail.com>2015-10-03 18:00:58 -0700
commita6f04b0e15af9ce261cc5bb190eb60a2bbaee804 (patch)
tree233f28f1b4df9566667013f47c5e9a09920626e9 /Source/Core/DiscIO/NANDContentLoader.cpp
parent8bb35c85887eaef35ddcb7dfaae394f7d1165fe1 (diff)
parentf6795466e767ee11e3f2c7d93c8f51abeabd29af (diff)
Merge pull request #3091 from Tilka/mbedtls
Update mbed TLS (PolarSSL)
Diffstat (limited to 'Source/Core/DiscIO/NANDContentLoader.cpp')
-rw-r--r--Source/Core/DiscIO/NANDContentLoader.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/Core/DiscIO/NANDContentLoader.cpp b/Source/Core/DiscIO/NANDContentLoader.cpp
index 733f0735d8..0e26fa051e 100644
--- a/Source/Core/DiscIO/NANDContentLoader.cpp
+++ b/Source/Core/DiscIO/NANDContentLoader.cpp
@@ -10,7 +10,7 @@
#include <string>
#include <utility>
#include <vector>
-#include <polarssl/aes.h>
+#include <mbedtls/aes.h>
#include "Common/CommonTypes.h"
#include "Common/FileUtil.h"
@@ -279,10 +279,10 @@ bool CNANDContentLoader::Initialize(const std::string& _rName)
}
void CNANDContentLoader::AESDecode(u8* _pKey, u8* _IV, u8* _pSrc, u32 _Size, u8* _pDest)
{
- aes_context AES_ctx;
+ mbedtls_aes_context AES_ctx;
- aes_setkey_dec(&AES_ctx, _pKey, 128);
- aes_crypt_cbc(&AES_ctx, AES_DECRYPT, _Size, _IV, _pSrc, _pDest);
+ mbedtls_aes_setkey_dec(&AES_ctx, _pKey, 128);
+ mbedtls_aes_crypt_cbc(&AES_ctx, MBEDTLS_AES_DECRYPT, _Size, _IV, _pSrc, _pDest);
}
void CNANDContentLoader::GetKeyFromTicket(u8* pTicket, u8* pTicketKey)