diff --git a/rpcs3/Crypto/ec.cpp b/rpcs3/Crypto/ec.cpp index 8ed57cee99..4a125a1736 100644 --- a/rpcs3/Crypto/ec.cpp +++ b/rpcs3/Crypto/ec.cpp @@ -465,7 +465,7 @@ static void ec_priv_to_pub(u8 *k, u8 *Q) } #endif -int ecdsa_set_curve(const u8* p, const u8* a, const u8* b, const u8* N, const u8* Gx, const u8* Gy) +int ecdsa_set_curve(u8* p, u8* a, u8* b, u8* N, u8* Gx, u8* Gy) { memcpy(ec_p, p, 20); memcpy(ec_a, a, 20); @@ -482,14 +482,14 @@ int ecdsa_set_curve(const u8* p, const u8* a, const u8* b, const u8* N, const u8 return 0; } -void ecdsa_set_pub(const u8* Q) +void ecdsa_set_pub(u8 *Q) { memcpy(ec_Q.x, Q, 20); memcpy(ec_Q.y, Q+20, 20); point_to_mon(&ec_Q); } -void ecdsa_set_priv(const u8* k) +void ecdsa_set_priv(u8 *k) { memcpy(ec_k, k, sizeof ec_k); } diff --git a/rpcs3/Crypto/ec.h b/rpcs3/Crypto/ec.h index 49b4685c4e..614727c3e0 100644 --- a/rpcs3/Crypto/ec.h +++ b/rpcs3/Crypto/ec.h @@ -7,7 +7,7 @@ #include #include -int ecdsa_set_curve(const unsigned char *p, const unsigned char *a, const unsigned char *b, const unsigned char *N, const unsigned char *Gx, const unsigned char *Gy); -void ecdsa_set_pub(const unsigned char *Q); -void ecdsa_set_priv(const unsigned char *k); +int ecdsa_set_curve(unsigned char *p, unsigned char *a, unsigned char *b, unsigned char *N, unsigned char *Gx, unsigned char *Gy); +void ecdsa_set_pub(unsigned char *Q); +void ecdsa_set_priv(unsigned char *k); int ecdsa_verify(unsigned char *hash, unsigned char *R, unsigned char *S); diff --git a/rpcs3/Crypto/key_vault.h b/rpcs3/Crypto/key_vault.h index 84d52a4992..ad5d4e6c99 100644 --- a/rpcs3/Crypto/key_vault.h +++ b/rpcs3/Crypto/key_vault.h @@ -1,221 +1,230 @@ -#pragma once - -#include "util/types.hpp" - -#include -#include -#include - -enum SELF_KEY_TYPE -{ - KEY_LV0 = 1, - KEY_LV1, - KEY_LV2, - KEY_APP, - KEY_ISO, - KEY_LDR, - KEY_UNK7, - KEY_NPDRM -}; - -struct SELF_KEY -{ - u64 version_start; - u64 version_end; - u16 revision; - u32 self_type; - u8 erk[0x20]; - u8 riv[0x10]; - u8 pub[0x28]; - u8 priv[0x15]; - u32 curve_type; - - SELF_KEY(u64 ver_start, u64 ver_end, u16 rev, u32 type, const std::string& e, const std::string& r, const std::string& pb, const std::string& pr, u32 ct); -}; - -constexpr u8 PKG_AES_KEY_IDU[0x10] = { - 0x5d, 0xb9, 0x11, 0xe6, 0xb7, 0xe5, 0x0a, 0x7d, 0x32, 0x15, 0x38, 0xfd, 0x7c, 0x66, 0xf1, 0x7b -}; - -constexpr u8 PKG_AES_KEY[0x10] = { - 0x2e, 0x7b, 0x71, 0xd7, 0xc9, 0xc9, 0xa1, 0x4e, 0xa3, 0x22, 0x1f, 0x18, 0x88, 0x28, 0xb8, 0xf8 -}; - -constexpr u8 PKG_AES_KEY2[0x10] = { - 0x07, 0xf2, 0xc6, 0x82, 0x90, 0xb5, 0x0d, 0x2c, 0x33, 0x81, 0x8d, 0x70, 0x9b, 0x60, 0xe6, 0x2b -}; - -constexpr u8 PKG_AES_KEY_VITA_1[0x10] = { - 0xE3, 0x1A, 0x70, 0xC9, 0xCE, 0x1D, 0xD7, 0x2B, 0xF3, 0xC0, 0x62, 0x29, 0x63, 0xF2, 0xEC, 0xCB -}; - -constexpr u8 PKG_AES_KEY_VITA_2[0x10] = { - 0x42, 0x3A, 0xCA, 0x3A, 0x2B, 0xD5, 0x64, 0x9F, 0x96, 0x86, 0xAB, 0xAD, 0x6F, 0xD8, 0x80, 0x1F -}; - -constexpr u8 PKG_AES_KEY_VITA_3[0x10] = { - 0xAF, 0x07, 0xFD, 0x59, 0x65, 0x25, 0x27, 0xBA, 0xF1, 0x33, 0x89, 0x66, 0x8B, 0x17, 0xD9, 0xEA -}; - -constexpr u8 NP_IDPS[0x10] = { - 0x5E, 0x06, 0xE0, 0x4F, 0xD9, 0x4A, 0x71, 0xBF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 -}; - -constexpr u8 NP_KLIC_FREE[0x10] = { - 0x72, 0xF9, 0x90, 0x78, 0x8F, 0x9C, 0xFF, 0x74, 0x57, 0x25, 0xF0, 0x8E, 0x4C, 0x12, 0x83, 0x87 -}; - -constexpr u8 NP_OMAC_KEY_2[0x10] = { - 0x6B, 0xA5, 0x29, 0x76, 0xEF, 0xDA, 0x16, 0xEF, 0x3C, 0x33, 0x9F, 0xB2, 0x97, 0x1E, 0x25, 0x6B -}; - -constexpr u8 NP_OMAC_KEY_3[0x10] = { - 0x9B, 0x51, 0x5F, 0xEA, 0xCF, 0x75, 0x06, 0x49, 0x81, 0xAA, 0x60, 0x4D, 0x91, 0xA5, 0x4E, 0x97 -}; - -constexpr u8 NP_KLIC_KEY[0x10] = { - 0xF2, 0xFB, 0xCA, 0x7A, 0x75, 0xB0, 0x4E, 0xDC, 0x13, 0x90, 0x63, 0x8C, 0xCD, 0xFD, 0xD1, 0xEE -}; - -constexpr u8 NP_RIF_KEY[0x10] = { - 0xDA, 0x7D, 0x4B, 0x5E, 0x49, 0x9A, 0x4F, 0x53, 0xB1, 0xC1, 0xA1, 0x4A, 0x74, 0x84, 0x44, 0x3B -}; - -// PSP Minis -constexpr u8 NP_PSP_KEY_1[0x10] = { - 0x2A, 0x6A, 0xFB, 0xCF, 0x43, 0xD1, 0x57, 0x9F, 0x7D, 0x73, 0x87, 0x41, 0xA1, 0x3B, 0xD4, 0x2E -}; - -// PSP Remasters -constexpr u8 NP_PSP_KEY_2[0x10] = { - 0x0D, 0xB8, 0x57, 0x32, 0x36, 0x6C, 0xD7, 0x34, 0xFC, 0x87, 0x9E, 0x74, 0x33, 0x43, 0xBB, 0x4F -}; - -constexpr u8 NP_PSX_KEY[0x10] = { - 0x52, 0xC0, 0xB5, 0xCA, 0x76, 0xD6, 0x13, 0x4B, 0xB4, 0x5F, 0xC6, 0x6C, 0xA6, 0x37, 0xF2, 0xC1 -}; - -constexpr u8 RAP_KEY[0x10] = { - 0x86, 0x9F, 0x77, 0x45, 0xC1, 0x3F, 0xD8, 0x90, 0xCC, 0xF2, 0x91, 0x88, 0xE3, 0xCC, 0x3E, 0xDF -}; - -constexpr u8 RAP_PBOX[0x10] = { - 0x0C, 0x03, 0x06, 0x04, 0x01, 0x0B, 0x0F, 0x08, 0x02, 0x07, 0x00, 0x05, 0x0A, 0x0E, 0x0D, 0x09 -}; - -constexpr u8 RAP_E1[0x10] = { - 0xA9, 0x3E, 0x1F, 0xD6, 0x7C, 0x55, 0xA3, 0x29, 0xB7, 0x5F, 0xDD, 0xA6, 0x2A, 0x95, 0xC7, 0xA5 -}; - -constexpr u8 RAP_E2[0x10] = { - 0x67, 0xD4, 0x5D, 0xA3, 0x29, 0x6D, 0x00, 0x6A, 0x4E, 0x7C, 0x53, 0x7B, 0xF5, 0x53, 0x8C, 0x74 -}; - -constexpr u8 SDAT_KEY[0x10] = { - 0x0D, 0x65, 0x5E, 0xF8, 0xE6, 0x74, 0xA9, 0x8A, 0xB8, 0x50, 0x5C, 0xFA, 0x7D, 0x01, 0x29, 0x33 -}; - -constexpr u8 EDAT_KEY_0[0x10] = { - 0xBE, 0x95, 0x9C, 0xA8, 0x30, 0x8D, 0xEF, 0xA2, 0xE5, 0xE1, 0x80, 0xC6, 0x37, 0x12, 0xA9, 0xAE -}; - -constexpr u8 EDAT_HASH_0[0x10] = { - 0xEF, 0xFE, 0x5B, 0xD1, 0x65, 0x2E, 0xEB, 0xC1, 0x19, 0x18, 0xCF, 0x7C, 0x04, 0xD4, 0xF0, 0x11 -}; - -constexpr u8 EDAT_KEY_1[0x10] = { - 0x4C, 0xA9, 0xC1, 0x4B, 0x01, 0xC9, 0x53, 0x09, 0x96, 0x9B, 0xEC, 0x68, 0xAA, 0x0B, 0xC0, 0x81 -}; - -constexpr u8 EDAT_HASH_1[0x10] = { - 0x3D, 0x92, 0x69, 0x9B, 0x70, 0x5B, 0x07, 0x38, 0x54, 0xD8, 0xFC, 0xC6, 0xC7, 0x67, 0x27, 0x47 -}; - -constexpr u8 EDAT_IV[0x10] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -}; - -constexpr u8 VSH_CURVE_P[0x14] = { - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x01, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF -}; - -constexpr u8 VSH_CURVE_A[0x14] = { - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x01, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC -}; - -constexpr u8 VSH_CURVE_B[0x14] = { - 0xA6, 0x8B, 0xED, 0xC3, 0x34, 0x18, 0x02, 0x9C, 0x1D, 0x3C, 0xE3, 0x3B, 0x9A, 0x32, 0x1F, 0xCC, 0xBB, 0x9E, 0x0F, 0x0B -}; - -constexpr u8 VSH_CURVE_N[0x15] = { - 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0xFF, 0xFF, 0xB5, 0xAE, 0x3C, 0x52, 0x3E, 0x63, 0x94, 0x4F, 0x21, 0x27 -}; - -constexpr u8 VSH_CURVE_GX[0x14] = { - 0x12, 0x8E, 0xC4, 0x25, 0x64, 0x87, 0xFD, 0x8F, 0xDF, 0x64, 0xE2, 0x43, 0x7B, 0xC0, 0xA1, 0xF6, 0xD5, 0xAF, 0xDE, 0x2C -}; - -constexpr u8 VSH_CURVE_GY[0x14] = { - 0x59, 0x58, 0x55, 0x7E, 0xB1, 0xDB, 0x00, 0x12, 0x60, 0x42, 0x55, 0x24, 0xDB, 0xC3, 0x79, 0xD5, 0xAC, 0x5F, 0x4A, 0xDF -}; - -constexpr u8 VSH_PUB[0x28] = { - 0x62, 0x27, 0xB0, 0x0A, 0x02, 0x85, 0x6F, 0xB0, 0x41, 0x08, 0x87, 0x67, 0x19, 0xE0, 0xA0, 0x18, 0x32, 0x91, 0xEE, 0xB9, - 0x6E, 0x73, 0x6A, 0xBF, 0x81, 0xF7, 0x0E, 0xE9, 0x16, 0x1B, 0x0D, 0xDE, 0xB0, 0x26, 0x76, 0x1A, 0xFF, 0x7B, 0xC8, 0x5B -}; - -constexpr u8 SCEPKG_RIV[0x10] = { - 0x4A, 0xCE, 0xF0, 0x12, 0x24, 0xFB, 0xEE, 0xDF, 0x82, 0x45, 0xF8, 0xFF, 0x10, 0x21, 0x1E, 0x6E -}; - -constexpr u8 SCEPKG_ERK[0x20] = { - 0xA9, 0x78, 0x18, 0xBD, 0x19, 0x3A, 0x67, 0xA1, 0x6F, 0xE8, 0x3A, 0x85, 0x5E, 0x1B, 0xE9, 0xFB, 0x56, 0x40, 0x93, 0x8D, - 0x4D, 0xBC, 0xB2, 0xCB, 0x52, 0xC5, 0xA2, 0xF8, 0xB0, 0x2B, 0x10, 0x31 -}; - -constexpr u8 PUP_KEY[0x40] = { - 0xF4, 0x91, 0xAD, 0x94, 0xC6, 0x81, 0x10, 0x96, 0x91, 0x5F, 0xD5, 0xD2, 0x44, 0x81, 0xAE, 0xDC, 0xED, 0xED, 0xBE, 0x6B, - 0xE5, 0x13, 0x72, 0x4D, 0xD8, 0xF7, 0xB6, 0x91, 0xE8, 0x8A, 0x38, 0xF4, 0xB5, 0x16, 0x2B, 0xFB, 0xEC, 0xBE, 0x3A, 0x62, - 0x18, 0x5D, 0xD7, 0xC9, 0x4D, 0xA2, 0x22, 0x5A, 0xDA, 0x3F, 0xBF, 0xCE, 0x55, 0x5B, 0x9E, 0xA9, 0x64, 0x98, 0x29, 0xEB, - 0x30, 0xCE, 0x83, 0x66 -}; - -class KeyVault -{ - std::vector sk_LV0_arr; - std::vector sk_LV1_arr; - std::vector sk_LV2_arr; - std::vector sk_APP_arr; - std::vector sk_ISO_arr; - std::vector sk_LDR_arr; - std::vector sk_UNK7_arr; - std::vector sk_NPDRM_arr; - std::unique_ptr klicensee_key; - -public: - KeyVault(); - SELF_KEY FindSelfKey(u32 type, u16 revision, u64 version); - void SetKlicenseeKey(u8 *key); - u8 *GetKlicenseeKey(); - -private: - void LoadSelfLV0Keys(); - void LoadSelfLDRKeys(); - void LoadSelfLV1Keys(); - void LoadSelfLV2Keys(); - void LoadSelfISOKeys(); - void LoadSelfAPPKeys(); - void LoadSelfUNK7Keys(); - void LoadSelfNPDRMKeys(); - SELF_KEY GetSelfLV0Key() const; - SELF_KEY GetSelfLDRKey() const; - SELF_KEY GetSelfLV1Key(u64 version) const; - SELF_KEY GetSelfLV2Key(u64 version) const; - SELF_KEY GetSelfISOKey(u16 revision, u64 version) const; - SELF_KEY GetSelfAPPKey(u16 revision) const; - SELF_KEY GetSelfUNK7Key(u64 version) const; - SELF_KEY GetSelfNPDRMKey(u16 revision) const; -}; - -// RAP to RIF function. -void rap_to_rif(unsigned char* rap, unsigned char* rif); +#pragma once + +#include "util/types.hpp" + +#include +#include +#include + +enum SELF_KEY_TYPE +{ + KEY_LV0 = 1, + KEY_LV1, + KEY_LV2, + KEY_APP, + KEY_ISO, + KEY_LDR, + KEY_UNK7, + KEY_NPDRM +}; + +struct SELF_KEY +{ + u64 version_start; + u64 version_end; + u16 revision; + u32 self_type; + u8 erk[0x20]; + u8 riv[0x10]; + u8 pub[0x28]; + u8 priv[0x15]; + u32 curve_type; + + SELF_KEY(u64 ver_start, u64 ver_end, u16 rev, u32 type, const std::string& e, const std::string& r, const std::string& pb, const std::string& pr, u32 ct); +}; + +#ifndef _MSC_VER +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wunused-variable" +#endif + +static u8 PKG_AES_KEY_IDU[0x10] = { + 0x5d, 0xb9, 0x11, 0xe6, 0xb7, 0xe5, 0x0a, 0x7d, 0x32, 0x15, 0x38, 0xfd, 0x7c, 0x66, 0xf1, 0x7b +}; + +static u8 PKG_AES_KEY[0x10] = { + 0x2e, 0x7b, 0x71, 0xd7, 0xc9, 0xc9, 0xa1, 0x4e, 0xa3, 0x22, 0x1f, 0x18, 0x88, 0x28, 0xb8, 0xf8 +}; + +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 +}; + +static u8 NP_KLIC_FREE[0x10] = { + 0x72, 0xF9, 0x90, 0x78, 0x8F, 0x9C, 0xFF, 0x74, 0x57, 0x25, 0xF0, 0x8E, 0x4C, 0x12, 0x83, 0x87 +}; + +static u8 NP_OMAC_KEY_2[0x10] = { + 0x6B, 0xA5, 0x29, 0x76, 0xEF, 0xDA, 0x16, 0xEF, 0x3C, 0x33, 0x9F, 0xB2, 0x97, 0x1E, 0x25, 0x6B +}; + +static u8 NP_OMAC_KEY_3[0x10] = { + 0x9B, 0x51, 0x5F, 0xEA, 0xCF, 0x75, 0x06, 0x49, 0x81, 0xAA, 0x60, 0x4D, 0x91, 0xA5, 0x4E, 0x97 +}; + +static u8 NP_KLIC_KEY[0x10] = { + 0xF2, 0xFB, 0xCA, 0x7A, 0x75, 0xB0, 0x4E, 0xDC, 0x13, 0x90, 0x63, 0x8C, 0xCD, 0xFD, 0xD1, 0xEE +}; + +static u8 NP_RIF_KEY[0x10] = { + 0xDA, 0x7D, 0x4B, 0x5E, 0x49, 0x9A, 0x4F, 0x53, 0xB1, 0xC1, 0xA1, 0x4A, 0x74, 0x84, 0x44, 0x3B +}; + +// PSP Minis +static u8 NP_PSP_KEY_1[0x10] = { + 0x2A, 0x6A, 0xFB, 0xCF, 0x43, 0xD1, 0x57, 0x9F, 0x7D, 0x73, 0x87, 0x41, 0xA1, 0x3B, 0xD4, 0x2E +}; + +// PSP Remasters +static u8 NP_PSP_KEY_2[0x10] = { + 0x0D, 0xB8, 0x57, 0x32, 0x36, 0x6C, 0xD7, 0x34, 0xFC, 0x87, 0x9E, 0x74, 0x33, 0x43, 0xBB, 0x4F +}; + +static u8 NP_PSX_KEY[0x10] = { + 0x52, 0xC0, 0xB5, 0xCA, 0x76, 0xD6, 0x13, 0x4B, 0xB4, 0x5F, 0xC6, 0x6C, 0xA6, 0x37, 0xF2, 0xC1 +}; + +static u8 RAP_KEY[0x10] = { + 0x86, 0x9F, 0x77, 0x45, 0xC1, 0x3F, 0xD8, 0x90, 0xCC, 0xF2, 0x91, 0x88, 0xE3, 0xCC, 0x3E, 0xDF +}; + +static u8 RAP_PBOX[0x10] = { + 0x0C, 0x03, 0x06, 0x04, 0x01, 0x0B, 0x0F, 0x08, 0x02, 0x07, 0x00, 0x05, 0x0A, 0x0E, 0x0D, 0x09 +}; + +static u8 RAP_E1[0x10] = { + 0xA9, 0x3E, 0x1F, 0xD6, 0x7C, 0x55, 0xA3, 0x29, 0xB7, 0x5F, 0xDD, 0xA6, 0x2A, 0x95, 0xC7, 0xA5 +}; + +static u8 RAP_E2[0x10] = { + 0x67, 0xD4, 0x5D, 0xA3, 0x29, 0x6D, 0x00, 0x6A, 0x4E, 0x7C, 0x53, 0x7B, 0xF5, 0x53, 0x8C, 0x74 +}; + +static u8 SDAT_KEY[0x10] = { + 0x0D, 0x65, 0x5E, 0xF8, 0xE6, 0x74, 0xA9, 0x8A, 0xB8, 0x50, 0x5C, 0xFA, 0x7D, 0x01, 0x29, 0x33 +}; + +static u8 EDAT_KEY_0[0x10] = { + 0xBE, 0x95, 0x9C, 0xA8, 0x30, 0x8D, 0xEF, 0xA2, 0xE5, 0xE1, 0x80, 0xC6, 0x37, 0x12, 0xA9, 0xAE +}; + +static u8 EDAT_HASH_0[0x10] = { + 0xEF, 0xFE, 0x5B, 0xD1, 0x65, 0x2E, 0xEB, 0xC1, 0x19, 0x18, 0xCF, 0x7C, 0x04, 0xD4, 0xF0, 0x11 +}; + +static u8 EDAT_KEY_1[0x10] = { + 0x4C, 0xA9, 0xC1, 0x4B, 0x01, 0xC9, 0x53, 0x09, 0x96, 0x9B, 0xEC, 0x68, 0xAA, 0x0B, 0xC0, 0x81 +}; + +static u8 EDAT_HASH_1[0x10] = { + 0x3D, 0x92, 0x69, 0x9B, 0x70, 0x5B, 0x07, 0x38, 0x54, 0xD8, 0xFC, 0xC6, 0xC7, 0x67, 0x27, 0x47 +}; + +static u8 EDAT_IV[0x10] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +}; + +static u8 VSH_CURVE_P[0x14] = { + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x01, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF +}; + +static u8 VSH_CURVE_A[0x14] = { + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x01, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC +}; + +static u8 VSH_CURVE_B[0x14] = { + 0xA6, 0x8B, 0xED, 0xC3, 0x34, 0x18, 0x02, 0x9C, 0x1D, 0x3C, 0xE3, 0x3B, 0x9A, 0x32, 0x1F, 0xCC, 0xBB, 0x9E, 0x0F, 0x0B +}; + +static u8 VSH_CURVE_N[0x15] = { + 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0xFF, 0xFF, 0xB5, 0xAE, 0x3C, 0x52, 0x3E, 0x63, 0x94, 0x4F, 0x21, 0x27 +}; + +static u8 VSH_CURVE_GX[0x14] = { + 0x12, 0x8E, 0xC4, 0x25, 0x64, 0x87, 0xFD, 0x8F, 0xDF, 0x64, 0xE2, 0x43, 0x7B, 0xC0, 0xA1, 0xF6, 0xD5, 0xAF, 0xDE, 0x2C +}; + +static u8 VSH_CURVE_GY[0x14] = { + 0x59, 0x58, 0x55, 0x7E, 0xB1, 0xDB, 0x00, 0x12, 0x60, 0x42, 0x55, 0x24, 0xDB, 0xC3, 0x79, 0xD5, 0xAC, 0x5F, 0x4A, 0xDF +}; + +static u8 VSH_PUB[0x28] = { + 0x62, 0x27, 0xB0, 0x0A, 0x02, 0x85, 0x6F, 0xB0, 0x41, 0x08, 0x87, 0x67, 0x19, 0xE0, 0xA0, 0x18, 0x32, 0x91, 0xEE, 0xB9, + 0x6E, 0x73, 0x6A, 0xBF, 0x81, 0xF7, 0x0E, 0xE9, 0x16, 0x1B, 0x0D, 0xDE, 0xB0, 0x26, 0x76, 0x1A, 0xFF, 0x7B, 0xC8, 0x5B +}; + +static u8 SCEPKG_RIV[0x10] = { + 0x4A, 0xCE, 0xF0, 0x12, 0x24, 0xFB, 0xEE, 0xDF, 0x82, 0x45, 0xF8, 0xFF, 0x10, 0x21, 0x1E, 0x6E +}; + +static u8 SCEPKG_ERK[0x20] = { + 0xA9, 0x78, 0x18, 0xBD, 0x19, 0x3A, 0x67, 0xA1, 0x6F, 0xE8, 0x3A, 0x85, 0x5E, 0x1B, 0xE9, 0xFB, 0x56, 0x40, 0x93, 0x8D, + 0x4D, 0xBC, 0xB2, 0xCB, 0x52, 0xC5, 0xA2, 0xF8, 0xB0, 0x2B, 0x10, 0x31 +}; + +static u8 PUP_KEY[0x40] = { + 0xF4, 0x91, 0xAD, 0x94, 0xC6, 0x81, 0x10, 0x96, 0x91, 0x5F, 0xD5, 0xD2, 0x44, 0x81, 0xAE, 0xDC, 0xED, 0xED, 0xBE, 0x6B, + 0xE5, 0x13, 0x72, 0x4D, 0xD8, 0xF7, 0xB6, 0x91, 0xE8, 0x8A, 0x38, 0xF4, 0xB5, 0x16, 0x2B, 0xFB, 0xEC, 0xBE, 0x3A, 0x62, + 0x18, 0x5D, 0xD7, 0xC9, 0x4D, 0xA2, 0x22, 0x5A, 0xDA, 0x3F, 0xBF, 0xCE, 0x55, 0x5B, 0x9E, 0xA9, 0x64, 0x98, 0x29, 0xEB, + 0x30, 0xCE, 0x83, 0x66 +}; + +#ifndef _MSC_VER +#pragma GCC diagnostic pop +#endif + +class KeyVault +{ + std::vector sk_LV0_arr; + std::vector sk_LV1_arr; + std::vector sk_LV2_arr; + std::vector sk_APP_arr; + std::vector sk_ISO_arr; + std::vector sk_LDR_arr; + std::vector sk_UNK7_arr; + std::vector sk_NPDRM_arr; + std::unique_ptr klicensee_key; + +public: + KeyVault(); + SELF_KEY FindSelfKey(u32 type, u16 revision, u64 version); + void SetKlicenseeKey(u8 *key); + u8 *GetKlicenseeKey(); + +private: + void LoadSelfLV0Keys(); + void LoadSelfLDRKeys(); + void LoadSelfLV1Keys(); + void LoadSelfLV2Keys(); + void LoadSelfISOKeys(); + void LoadSelfAPPKeys(); + void LoadSelfUNK7Keys(); + void LoadSelfNPDRMKeys(); + SELF_KEY GetSelfLV0Key() const; + SELF_KEY GetSelfLDRKey() const; + SELF_KEY GetSelfLV1Key(u64 version) const; + SELF_KEY GetSelfLV2Key(u64 version) const; + SELF_KEY GetSelfISOKey(u16 revision, u64 version) const; + SELF_KEY GetSelfAPPKey(u16 revision) const; + SELF_KEY GetSelfUNK7Key(u64 version) const; + SELF_KEY GetSelfNPDRMKey(u16 revision) const; +}; + +// RAP to RIF function. +void rap_to_rif(unsigned char* rap, unsigned char* rif); diff --git a/rpcs3/Crypto/unedat.cpp b/rpcs3/Crypto/unedat.cpp index d9e544b239..d8c885be97 100644 --- a/rpcs3/Crypto/unedat.cpp +++ b/rpcs3/Crypto/unedat.cpp @@ -23,7 +23,7 @@ void generate_key(int crypto_mode, int version, unsigned char *key_final, unsign case 0x10000000: // Encrypted ERK. // Decrypt the key with EDAT_KEY + EDAT_IV and copy the original IV. - aescbc128_decrypt(const_cast(version ? EDAT_KEY_1 : EDAT_KEY_0), const_cast(EDAT_IV), key, key_final, 0x10); + aescbc128_decrypt(version ? EDAT_KEY_1 : EDAT_KEY_0, EDAT_IV, key, key_final, 0x10); memcpy(iv_final, iv, 0x10); break; case 0x20000000: @@ -49,7 +49,7 @@ void generate_hash(int hash_mode, int version, unsigned char *hash_final, unsign case 0x10000000: // Encrypted HASH. // Decrypt the hash with EDAT_KEY + EDAT_IV. - aescbc128_decrypt(const_cast(version ? EDAT_KEY_1 : EDAT_KEY_0), const_cast(EDAT_IV), hash, hash_final, 0x10); + aescbc128_decrypt(version ? EDAT_KEY_1 : EDAT_KEY_0, EDAT_IV, hash, hash_final, 0x10); break; case 0x20000000: // Default HASH.