diff --git a/Source/Core/Core/HW/WiiSave.cpp b/Source/Core/Core/HW/WiiSave.cpp index 5802c0faa4..2230132e13 100644 --- a/Source/Core/Core/HW/WiiSave.cpp +++ b/Source/Core/Core/HW/WiiSave.cpp @@ -31,11 +31,11 @@ #include "Common/StringUtil.h" #include "Common/Swap.h" -const u8 WiiSave::s_sd_key[16] = {0xAB, 0x01, 0xB9, 0xD8, 0xE1, 0x62, 0x2B, 0x08, - 0xAF, 0xBA, 0xD8, 0x4D, 0xBF, 0xC2, 0xA5, 0x5D}; -const u8 WiiSave::s_md5_blanker[16] = {0x0E, 0x65, 0x37, 0x81, 0x99, 0xBE, 0x45, 0x17, - 0xAB, 0x06, 0xEC, 0x22, 0x45, 0x1A, 0x57, 0x93}; -const u32 WiiSave::s_ng_id = 0x0403AC68; +constexpr u8 s_sd_key[16] = {0xAB, 0x01, 0xB9, 0xD8, 0xE1, 0x62, 0x2B, 0x08, + 0xAF, 0xBA, 0xD8, 0x4D, 0xBF, 0xC2, 0xA5, 0x5D}; +constexpr u8 s_md5_blanker[16] = {0x0E, 0x65, 0x37, 0x81, 0x99, 0xBE, 0x45, 0x17, + 0xAB, 0x06, 0xEC, 0x22, 0x45, 0x1A, 0x57, 0x93}; +constexpr u32 s_ng_id = 0x0403AC68; bool WiiSave::ImportWiiSave(const std::string& filename) { diff --git a/Source/Core/Core/HW/WiiSave.h b/Source/Core/Core/HW/WiiSave.h index 725179c330..52529320ac 100644 --- a/Source/Core/Core/HW/WiiSave.h +++ b/Source/Core/Core/HW/WiiSave.h @@ -34,10 +34,6 @@ private: void ScanForFiles(const std::string& save_directory, std::vector& file_list, u32* num_files, u32* size_files); - static const u8 s_sd_key[16]; - static const u8 s_md5_blanker[16]; - static const u32 s_ng_id; - mbedtls_aes_context m_aes_ctx; u8 m_sd_iv[0x10]; std::vector m_files_list;