From fd772f67262d04439bd2670ad958b7711e287bf9 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Mon, 23 Jan 2017 07:36:53 -0500
Subject: [PATCH] ES: Move the key table into the cpp file

This is a static implementation detail, so there's no need to bind it to the class directly.

This also makes the tables read-only.
---
 Source/Core/Core/IOS/ES/ES.cpp | 50 +++++++++++++++++-----------------
 Source/Core/Core/IOS/ES/ES.h   |  2 --
 2 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/Source/Core/Core/IOS/ES/ES.cpp b/Source/Core/Core/IOS/ES/ES.cpp
index 540ab0210c..9d069c33e0 100644
--- a/Source/Core/Core/IOS/ES/ES.cpp
+++ b/Source/Core/Core/IOS/ES/ES.cpp
@@ -75,33 +75,33 @@ namespace Device
 {
 std::string ES::m_ContentFile;
 
+constexpr u8 s_key_sd[0x10] = {0xab, 0x01, 0xb9, 0xd8, 0xe1, 0x62, 0x2b, 0x08,
+                               0xaf, 0xba, 0xd8, 0x4d, 0xbf, 0xc2, 0xa5, 0x5d};
+constexpr u8 s_key_ecc[0x1e] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01};
+constexpr u8 s_key_empty[0x10] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+
+// default key table
+constexpr const u8* s_key_table[11] = {
+    s_key_ecc,    // ECC Private Key
+    s_key_empty,  // Console ID
+    s_key_empty,  // NAND AES Key
+    s_key_empty,  // NAND HMAC
+    s_key_empty,  // Common Key
+    s_key_empty,  // PRNG seed
+    s_key_sd,     // SD Key
+    s_key_empty,  // Unknown
+    s_key_empty,  // Unknown
+    s_key_empty,  // Unknown
+    s_key_empty,  // Unknown
+};
+
 ES::ES(u32 device_id, const std::string& device_name) : Device(device_id, device_name)
 {
 }
 
-static u8 key_sd[0x10] = {0xab, 0x01, 0xb9, 0xd8, 0xe1, 0x62, 0x2b, 0x08,
-                          0xaf, 0xba, 0xd8, 0x4d, 0xbf, 0xc2, 0xa5, 0x5d};
-static u8 key_ecc[0x1e] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                           0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                           0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01};
-static u8 key_empty[0x10] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-
-// default key table
-u8* ES::keyTable[11] = {
-    key_ecc,    // ECC Private Key
-    key_empty,  // Console ID
-    key_empty,  // NAND AES Key
-    key_empty,  // NAND HMAC
-    key_empty,  // Common Key
-    key_empty,  // PRNG seed
-    key_sd,     // SD Key
-    key_empty,  // Unknown
-    key_empty,  // Unknown
-    key_empty,  // Unknown
-    key_empty,  // Unknown
-};
-
 void ES::LoadWAD(const std::string& _rContentFile)
 {
   m_ContentFile = _rContentFile;
@@ -110,7 +110,7 @@ void ES::LoadWAD(const std::string& _rContentFile)
 void ES::DecryptContent(u32 key_index, u8* iv, u8* input, u32 size, u8* new_iv, u8* output)
 {
   mbedtls_aes_context AES_ctx;
-  mbedtls_aes_setkey_dec(&AES_ctx, keyTable[key_index], 128);
+  mbedtls_aes_setkey_dec(&AES_ctx, s_key_table[key_index], 128);
   memcpy(new_iv, iv, 16);
   mbedtls_aes_crypt_cbc(&AES_ctx, MBEDTLS_AES_DECRYPT, size, new_iv, input, output);
 }
@@ -1000,7 +1000,7 @@ IPCCommandResult ES::IOCtlV(const IOCtlVRequest& request)
     u8* destination = Memory::GetPointer(request.io_vectors[1].address);
 
     mbedtls_aes_context AES_ctx;
-    mbedtls_aes_setkey_enc(&AES_ctx, keyTable[keyIndex], 128);
+    mbedtls_aes_setkey_enc(&AES_ctx, s_key_table[keyIndex], 128);
     memcpy(newIV, IV, 16);
     mbedtls_aes_crypt_cbc(&AES_ctx, MBEDTLS_AES_ENCRYPT, size, newIV, source, destination);
 
diff --git a/Source/Core/Core/IOS/ES/ES.h b/Source/Core/Core/IOS/ES/ES.h
index 7dde632af6..f1241e63fd 100644
--- a/Source/Core/Core/IOS/ES/ES.h
+++ b/Source/Core/Core/IOS/ES/ES.h
@@ -145,8 +145,6 @@ private:
   u64 m_TitleID = -1;
   u32 m_AccessIdentID = 0x6000000;
 
-  static u8* keyTable[11];
-
   // For title installation (ioctls IOCTL_ES_ADDTITLE*).
   TMDReader m_addtitle_tmd;
   u32 m_addtitle_content_id = 0xFFFFFFFF;