[dolphin-emu] 26/33: PolarSSL patch fixes

[James Cowgill]

This is an automated email from the git hooks/post-receive script.

jcowgill-guest pushed a commit to branch master
in repository dolphin-emu.

commit d74822b2ea7edd5ca6bd3f91bb76b73f5399b239
Author: James Cowgill <james410 at cowgill.org.uk>
Date:   Sun Nov 16 14:54:46 2014 +0000

    PolarSSL patch fixes
---
 debian/patches/04_use-polarssl-aes.patch | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/debian/patches/04_use-polarssl-aes.patch b/debian/patches/04_use-polarssl-aes.patch
index c305b1c..20dbb46 100644
--- a/debian/patches/04_use-polarssl-aes.patch
+++ b/debian/patches/04_use-polarssl-aes.patch
@@ -97,7 +97,7 @@ Applied-Upstream: https://github.com/dolphin-emu/dolphin/commit/8e73e8ae5fad7f1f
 -			AES_KEY AES_KEY;
 -			AES_set_decrypt_key((Korean ? g_MasterKeyK : g_MasterKey), 128, &AES_KEY);
 +			aes_context AES_ctx;
-+			aes_setkey_dec(&AES_ctx, (Korean ? g_MasterKeyK : g_MasterKey), 128); 
++			aes_setkey_dec(&AES_ctx, (Korean ? g_MasterKeyK : g_MasterKey), 128);
  
  			u8 VolumeKey[16];
 -			AES_cbc_encrypt(SubKey, VolumeKey, 16, &AES_KEY, IV, AES_DECRYPT);
@@ -131,7 +131,7 @@ Applied-Upstream: https://github.com/dolphin-emu/dolphin/commit/8e73e8ae5fad7f1f
  		{
  			memcpy(IV, m_pBuffer + 0x3d0, 16);
 -			AES_cbc_encrypt(m_pBuffer + 0x400, m_LastDecryptedBlock, 0x7C00, &m_AES_KEY, IV, AES_DECRYPT);
-+			aes_crypt_cbc(m_AES_ctx, AES_DECRYPT, 0x7C00, IV, m_pBuffer + 0x400, m_LastDecryptedBlock); 
++			aes_crypt_cbc(m_AES_ctx, AES_DECRYPT, 0x7C00, IV, m_pBuffer + 0x400, m_LastDecryptedBlock);
  
  			m_LastDecryptedBlockOffset = Block;
  		}
@@ -208,7 +208,7 @@ Applied-Upstream: https://github.com/dolphin-emu/dolphin/commit/8e73e8ae5fad7f1f
  				
  				memcpy(IV, _tmpFileHDR.IV, 0x10);
 -				AES_cbc_encrypt((const unsigned char *)&_encryptedData[0], &_data[0], RoundedFileSize, &m_AES_KEY, IV, AES_DECRYPT);
-+				aes_crypt_cbc(&m_AES_ctx, AES_DECRYPT, RoundedFileSize, IV, (const u8*)&_encryptedData[0], &_data[0]);  
++				aes_crypt_cbc(&m_AES_ctx, AES_DECRYPT, RoundedFileSize, IV, (const u8*)&_encryptedData[0], &_data[0]);
  	
  				if (!File::Exists(fullFilePath) || AskYesNoT("%s already exists, overwrite?", fullFilePath.c_str()))
  				{
@@ -243,3 +243,14 @@ Applied-Upstream: https://github.com/dolphin-emu/dolphin/commit/8e73e8ae5fad7f1f
  	u8 SD_IV[0x10];
  	std::vector<std::string> FilesList;
  
+--- a/Source/Core/Core/Src/ec_wii.cpp
++++ b/Source/Core/Core/Src/ec_wii.cpp
+@@ -10,7 +10,7 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include "Common.h"
+-#include "Crypto/aes.h"
++#include <polarssl/aes.h>
+ #include "polarssl/sha1.h"
+ #include "Crypto/tools.h"
+ #include "FileUtil.h"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/dolphin-emu.git