diff --git a/rpcs3/Crypto/unpkg.cpp b/rpcs3/Crypto/unpkg.cpp index baf612657dc4..006a910c6dfa 100644 --- a/rpcs3/Crypto/unpkg.cpp +++ b/rpcs3/Crypto/unpkg.cpp @@ -66,7 +66,7 @@ bool package_reader::read_header() } pkg_log.notice("Path: '%s'", m_path); - pkg_log.notice("Header: pkg_magic = 0x%x = \"%s\"", +m_header.pkg_magic, std::string_view(reinterpret_cast(&m_header.pkg_magic + 1), 3)); // Skip 0x7F + pkg_log.notice("Header: pkg_magic = 0x%x = \"%s\"", +m_header.pkg_magic, std::string_view(reinterpret_cast(&m_header.pkg_magic), 4).substr(1)); // Skip 0x7F pkg_log.notice("Header: pkg_type = 0x%x = %d", m_header.pkg_type, m_header.pkg_type); pkg_log.notice("Header: pkg_platform = 0x%x = %d", m_header.pkg_platform, m_header.pkg_platform); pkg_log.notice("Header: meta_offset = 0x%x = %d", m_header.meta_offset, m_header.meta_offset); @@ -93,7 +93,7 @@ bool package_reader::read_header() return false; } - pkg_log.notice("Extended header: magic = 0x%x = \"%s\"", +ext_header.magic, std::string_view(reinterpret_cast(&ext_header.magic + 1), 3)); + pkg_log.notice("Extended header: magic = 0x%x = \"%s\"", +ext_header.magic, std::string_view(reinterpret_cast(&ext_header.magic), 4).substr(1)); pkg_log.notice("Extended header: unknown_1 = 0x%x = %d", ext_header.unknown_1, ext_header.unknown_1); pkg_log.notice("Extended header: ext_hdr_size = 0x%x = %d", ext_header.ext_hdr_size, ext_header.ext_hdr_size); pkg_log.notice("Extended header: ext_data_size = 0x%x = %d", ext_header.ext_data_size, ext_header.ext_data_size); @@ -306,7 +306,7 @@ bool package_reader::read_metadata() if (packet.size == sizeof(m_metadata.qa_digest)) { archive_read(&m_metadata.qa_digest, sizeof(m_metadata.qa_digest)); - pkg_log.notice("Metadata: QA Digest = 0x%x", m_metadata.qa_digest); + pkg_log.notice("Metadata: QA Digest = %s", std::span(m_metadata.qa_digest, sizeof(m_metadata.qa_digest))); continue; } else @@ -494,11 +494,33 @@ bool package_reader::decrypt_data() aes_setkey_enc(&ctx, m_metadata.content_type == 0x15u ? PKG_AES_KEY_VITA_1 : m_metadata.content_type == 0x16u ? PKG_AES_KEY_VITA_2 : PKG_AES_KEY_VITA_3, 128); aes_crypt_ecb(&ctx, AES_ENCRYPT, reinterpret_cast(&m_header.klicensee), m_dec_key.data()); decrypt(0, m_header.file_count * sizeof(PKGEntry), m_dec_key.data()); + return true; } - else + + switch (m_metadata.package_revision.data.make_package_npdrm_ver[0]) + { + case 0x15: + { + if (!!(read_from_ptr(m_metadata.qa_digest) | read_from_ptr(m_metadata.qa_digest + 16))) + { + pkg_log.error("IDU PKG contains QA Digest!"); + } + + std::memcpy(m_dec_key.data(), PKG_AES_KEY_IDU, m_dec_key.size()); + decrypt(0, m_header.file_count * sizeof(PKGEntry), m_dec_key.data()); + break; + } + default: + { + pkg_log.error("Unknown NPDRM package version: 0x%x", read_from_ptr>(m_metadata.package_revision.data.make_package_npdrm_ver)); + [[fallthrough]]; + } + case 0x19: { std::memcpy(m_dec_key.data(), PKG_AES_KEY, m_dec_key.size()); - decrypt(0, m_header.file_count * sizeof(PKGEntry), m_header.pkg_platform == PKG_PLATFORM_TYPE_PSP_PSVITA ? PKG_AES_KEY2 : m_dec_key.data()); + decrypt(0, m_header.file_count * sizeof(PKGEntry), m_header.pkg_platform == PKG_PLATFORM_TYPE_PSP_PSVITA ? PKG_AES_KEY2 : m_dec_key.data());\ + break; + } } return true;