Merge branch 'John-K:master' into master

PrxDecrypter.cpp

@@ -159,6 +159,15 @@ static const u8 pauth_98b83b5d_xor[] = {0xA9, 0x1E, 0xDD, 0x7B, 0x09, 0xBB, 0x22
 static const u8 pauth_f7aa47f6_1[] = {0xC5, 0xFB, 0x69, 0x03, 0x20, 0x7A, 0xCF, 0xBA, 0x2C, 0x90, 0xF8, 0xB8, 0x4D, 0xD2, 0xF1, 0xDE};
 static const u8 pauth_f7aa47f6_2[] = {0x3A, 0x6B, 0x48, 0x96, 0x86, 0xA5, 0xC8, 0x80, 0x69, 0x6C, 0xE6, 0x4B, 0xF6, 0x04, 0x17, 0x44};
 static const u8 pauth_f7aa47f6_xor[] = {0xA9, 0x1E, 0xDD, 0x7B, 0x09, 0xBB, 0x22, 0xB5, 0x9D, 0xA3, 0x30, 0x69, 0x13, 0x6E, 0x0E, 0xD8};
+static const u8 keys0931_vita_psp_emu_v0[] = {0x08, 0x57, 0xC2, 0x49, 0x15, 0xD6, 0x2C, 0xDB, 0x62, 0xBE, 0x86, 0x6C, 0x75, 0x19, 0xDC, 0x4D};
+static const u8 keys0931_vita_psp_emu_k0[] = {0x48, 0x58, 0xAA, 0x38, 0x78, 0x9A, 0x6C, 0x0D, 0x42, 0xEA, 0xC8, 0x19, 0x23, 0x34, 0x4D, 0xF0};
+static const u8 keys200_vita_psp_emu_k0[] = {0x20, 0x00, 0x5B, 0x67, 0x48, 0x77, 0x02, 0x60, 0xCF, 0x0C, 0xAB, 0x7E, 0xAE, 0x0C, 0x55, 0xA1};
+static const u8 keys205_vita_psp_emu_k0[] = {0x3F, 0x67, 0x09, 0xA1, 0x47, 0x71, 0xD6, 0x9E, 0x27, 0x7C, 0x7B, 0x32, 0x67, 0x0E, 0x65, 0x8A};
+static const u8 keys310_vita_psp_emu_k0[] = {0x9B, 0x92, 0x99, 0x91, 0xA2, 0xE8, 0xAA, 0x4A, 0x87, 0x10, 0xA0, 0x9A, 0xBF, 0x88, 0xC0, 0xAC};
+static const u8 keys330_vita_psp_emu_k0[] = {0x90, 0x22, 0x66, 0xE9, 0x59, 0x11, 0x9B, 0x99, 0x67, 0x39, 0x49, 0x81, 0xAB, 0x98, 0x08, 0xA6};
+static const u8 keys351_vita_psp_emu_k0[] = {0xA0, 0xA5, 0x55, 0x0A, 0xFA, 0xB2, 0x16, 0x62, 0x05, 0xDC, 0x4B, 0x8E, 0xDA, 0xD5, 0xA5, 0xCA};
+static const u8 keys357_vita_psp_emu_k0[] = {0x78, 0x96, 0xAE, 0x9C, 0xE7, 0x89, 0x2D, 0xF5, 0x34, 0x9C, 0x29, 0x36, 0xD1, 0xF9, 0xE8, 0x3C};
+static const u8 keys365_vita_psp_emu_k0[] = {0x71, 0x44, 0x53, 0xB6, 0xE6, 0x75, 0x3F, 0xF0, 0x8D, 0x5E, 0xB4, 0xB2, 0xEA, 0x06, 0x23, 0x6A};
 
 // PRXDecrypter 144-byte tag keys.
 static const u32 g_key0[] = {
@@ -374,10 +383,19 @@ static const TAG_INFO2 g_tagInfo2[] =
 	{ 0x4C9497F0, keys660_k5, 0x43 },
 	{ 0x4C9492F0, keys660_k6, 0x43 },
 	{ 0x4C9496F0, keys660_k7, 0x43 },
+	{ 0x4C949AF0, keys0931_vita_psp_emu_k0, 0x43},
+	{ 0x4C949BF0, keys200_vita_psp_emu_k0, 0x43},
+	{ 0x4C949CF0, keys205_vita_psp_emu_k0, 0x43},
+	{ 0x4C949DF0, keys310_vita_psp_emu_k0, 0x43},
+	{ 0x4C949EF0, keys330_vita_psp_emu_k0, 0x43},
+	{ 0x4C949FF0, keys351_vita_psp_emu_k0, 0x43},
+	{ 0x4C94A0F0, keys357_vita_psp_emu_k0, 0x43},
+	{ 0x4C94A1F0, keys365_vita_psp_emu_k0, 0x43},
 	{ 0x457B90F0, keys660_v1, 0x5B },
 	{ 0x457B91F0, keys660_v7, 0x5B },
 	{ 0x457B92F0, keys660_v6, 0x5B },
 	{ 0x457B93F0, keys660_v3, 0x5B },
+	{ 0x457B9AF0, keys0931_vita_psp_emu_v0, 0x5B},
 	{ 0x380290F0, keys660_v2, 0x5A },
 	{ 0x380291F0, keys660_v8, 0x5A },
 	{ 0x380292F0, keys660_v4, 0x5A },