diff --git a/Source/Core/Common/Common.vcproj b/Source/Core/Common/Common.vcproj
index 02e184d576..4608f8340c 100644
--- a/Source/Core/Common/Common.vcproj
+++ b/Source/Core/Common/Common.vcproj
@@ -548,6 +548,38 @@
>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Source/Core/DolphinWX/Src/MemoryCards/Crypto/bn.cpp b/Source/Core/Common/Src/Crypto/bn.cpp
similarity index 98%
rename from Source/Core/DolphinWX/Src/MemoryCards/Crypto/bn.cpp
rename to Source/Core/Common/Src/Crypto/bn.cpp
index 78e6dc5eae..a0676df731 100644
--- a/Source/Core/DolphinWX/Src/MemoryCards/Crypto/bn.cpp
+++ b/Source/Core/Common/Src/Crypto/bn.cpp
@@ -4,7 +4,7 @@
#include
#include
-#include "Common.h"
+#include "../Common.h"
#include "tools.h"
/*static void bn_print(char *name, u8 *a, u32 n)
diff --git a/Source/Core/DolphinWX/Src/MemoryCards/Crypto/ec.cpp b/Source/Core/Common/Src/Crypto/ec.cpp
similarity index 93%
rename from Source/Core/DolphinWX/Src/MemoryCards/Crypto/ec.cpp
rename to Source/Core/Common/Src/Crypto/ec.cpp
index 86d9f617b3..fc99d99410 100644
--- a/Source/Core/DolphinWX/Src/MemoryCards/Crypto/ec.cpp
+++ b/Source/Core/Common/Src/Crypto/ec.cpp
@@ -4,10 +4,11 @@
#include
#include
-#include "Common.h"
+#include
+#include
+
+#include "../Common.h"
#include "tools.h"
-#include "time.h"
-#include "stdlib.h"
// y**2 + x*y = x**3 + x + b
static u8 ec_b[30] =
{0x00,0x66,0x64,0x7e,0xde,0x6c,0x33,0x2c,0x7f,0x8c,0x09,0x23,0xbb,0x58,0x21
diff --git a/Source/Core/DolphinWX/Src/MemoryCards/Crypto/md5.cpp b/Source/Core/Common/Src/Crypto/md5.cpp
similarity index 100%
rename from Source/Core/DolphinWX/Src/MemoryCards/Crypto/md5.cpp
rename to Source/Core/Common/Src/Crypto/md5.cpp
diff --git a/Source/Core/DolphinWX/Src/MemoryCards/Crypto/md5.h b/Source/Core/Common/Src/Crypto/md5.h
similarity index 100%
rename from Source/Core/DolphinWX/Src/MemoryCards/Crypto/md5.h
rename to Source/Core/Common/Src/Crypto/md5.h
diff --git a/Source/Core/DolphinWX/Src/MemoryCards/Crypto/sha1.cpp b/Source/Core/Common/Src/Crypto/sha1.cpp
similarity index 100%
rename from Source/Core/DolphinWX/Src/MemoryCards/Crypto/sha1.cpp
rename to Source/Core/Common/Src/Crypto/sha1.cpp
diff --git a/Source/Core/DolphinWX/Src/MemoryCards/Crypto/sha1.h b/Source/Core/Common/Src/Crypto/sha1.h
similarity index 100%
rename from Source/Core/DolphinWX/Src/MemoryCards/Crypto/sha1.h
rename to Source/Core/Common/Src/Crypto/sha1.h
diff --git a/Source/Core/DolphinWX/Src/MemoryCards/Crypto/tools.h b/Source/Core/Common/Src/Crypto/tools.h
similarity index 100%
rename from Source/Core/DolphinWX/Src/MemoryCards/Crypto/tools.h
rename to Source/Core/Common/Src/Crypto/tools.h
diff --git a/Source/Core/Common/Src/SConscript b/Source/Core/Common/Src/SConscript
index 78eab23c09..4bd50b60d5 100644
--- a/Source/Core/Common/Src/SConscript
+++ b/Source/Core/Common/Src/SConscript
@@ -39,6 +39,10 @@ files = [
"Thread.cpp",
"x64Emitter.cpp",
"x64Analyzer.cpp",
+ "Crypto/bn.cpp",
+ "Crypto/ec.cpp",
+ "Crypto/md5.cpp",
+ "Crypto/sha1.cpp",
]
if sys.platform == 'win32':
diff --git a/Source/Core/DolphinWX/DolphinWX.vcproj b/Source/Core/DolphinWX/DolphinWX.vcproj
index d5543355db..0af4eef3e1 100644
--- a/Source/Core/DolphinWX/DolphinWX.vcproj
+++ b/Source/Core/DolphinWX/DolphinWX.vcproj
@@ -1542,38 +1542,6 @@
>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp b/Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp
index 6b050ed4f0..4383749638 100644
--- a/Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp
+++ b/Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp
@@ -16,14 +16,11 @@
// http://code.google.com/p/dolphin-emu/
// Based off of tachtig/twintig http://git.infradead.org/?p=users/segher/wii.git
-// Copyright 2007,2008 Segher Boessenkool
-// Licensed under the terms of the GNU GPL, version 2
+// Copyright 2007,2008 Segher Boessenkool
+// Licensed under the terms of the GNU GPL, version 2
// http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
-
#include "WiiSaveCrypted.h"
-#include "FileUtil.h"
-
#include "FileUtil.h"
#include "MathUtil.h"
@@ -31,9 +28,9 @@ u8 SD_IV[0x10] = {0x21, 0x67, 0x12, 0xE6, 0xAA, 0x1F, 0x68, 0x9F,
0x95, 0xC5, 0xA2, 0x23, 0x24, 0xDC, 0x6A, 0x98};
const u8 SDKey[16] = {0xAB, 0x01, 0xB9, 0xD8, 0xE1, 0x62, 0x2B, 0x08,
0xAF, 0xBA, 0xD8, 0x4D, 0xBF, 0xC2, 0xA5, 0x5D};
-
u8 MD5_BLANKER[0x10] = {0x0E, 0x65, 0x37, 0x81, 0x99, 0xBE, 0x45, 0x17,
0xAB, 0x06, 0xEC, 0x22, 0x45, 0x1A, 0x57, 0x93};
+
CWiiSaveCrypted::CWiiSaveCrypted(const char* FileName, u64 title)
: _saveGameTitle(title)
{
diff --git a/Source/Core/DolphinWX/Src/SConscript b/Source/Core/DolphinWX/Src/SConscript
index 8563ced1bd..27d6b14fa8 100644
--- a/Source/Core/DolphinWX/Src/SConscript
+++ b/Source/Core/DolphinWX/Src/SConscript
@@ -37,10 +37,6 @@ if wxenv['HAVE_WX']:
'stdafx.cpp',
'WxUtils.cpp',
'MemoryCards/WiiSaveCrypted.cpp',
- 'MemoryCards/Crypto/bn.cpp',
- 'MemoryCards/Crypto/ec.cpp',
- 'MemoryCards/Crypto/md5.cpp',
- 'MemoryCards/Crypto/sha1.cpp',
]
CPPDEFINES = [