Merge branch 'master' into rsx-time

RPCS3 · Apr 24, 2020 · d23e27f · d23e27f
2 parents 86263dc + 256c74d
commit d23e27f
Show file tree

Hide file tree

Showing 33 changed files with 923 additions and 219 deletions.
diff --git a/rpcs3/Crypto/key_vault.h b/rpcs3/Crypto/key_vault.h
@@ -7,7 +7,8 @@
 #include <vector>
 #include <memory>
 
-enum SELF_KEY_TYPE {
+enum SELF_KEY_TYPE
+{
 	KEY_LV0 = 1,
 	KEY_LV1,
 	KEY_LV2,
@@ -18,7 +19,8 @@ enum SELF_KEY_TYPE {
 	KEY_NPDRM
 };
 
-struct SELF_KEY {
+struct SELF_KEY
+{
 	u64 version_start;
 	u64 version_end;
 	u16 revision;
@@ -44,6 +46,18 @@ static u8 PKG_AES_KEY2[0x10] = {
 	0x07, 0xf2, 0xc6, 0x82, 0x90, 0xb5, 0x0d, 0x2c, 0x33, 0x81, 0x8d, 0x70, 0x9b, 0x60, 0xe6, 0x2b
 };
 
+static u8 PKG_AES_KEY_VITA_1[0x10] = {
+	0xE3, 0x1A, 0x70, 0xC9, 0xCE, 0x1D, 0xD7, 0x2B, 0xF3, 0xC0, 0x62, 0x29, 0x63, 0xF2, 0xEC, 0xCB
+};
+
+static u8 PKG_AES_KEY_VITA_2[0x10] = {
+	0x42, 0x3A, 0xCA, 0x3A, 0x2B, 0xD5, 0x64, 0x9F, 0x96, 0x86, 0xAB, 0xAD, 0x6F, 0xD8, 0x80, 0x1F
+};
+
+static u8 PKG_AES_KEY_VITA_3[0x10] = {
+	0xAF, 0x07, 0xFD, 0x59, 0x65, 0x25, 0x27, 0xBA, 0xF1, 0x33, 0x89, 0x66, 0x8B, 0x17, 0xD9, 0xEA
+};
+
 static u8 NP_IDPS[0x10] = {
 	0x5E, 0x06, 0xE0, 0x4F, 0xD9, 0x4A, 0x71, 0xBF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01
 };