From c9f88e5e935acc48f65c94a6c1ec08a0edf813cc Mon Sep 17 00:00:00 2001 From: Jan Date: Tue, 16 Mar 2021 13:19:56 +0100 Subject: [PATCH] Use ZoneConstants class for IW4 --- src/ZoneCommon/Game/IW4/ZoneConstantsIW4.h | 65 +++++++++++++++++ .../Game/IW4/ZoneLoaderFactoryIW4.cpp | 69 +++---------------- .../Game/IW4/ZoneLoaderFactoryIW4.h | 13 ---- 3 files changed, 75 insertions(+), 72 deletions(-) diff --git a/src/ZoneCommon/Game/IW4/ZoneConstantsIW4.h b/src/ZoneCommon/Game/IW4/ZoneConstantsIW4.h index e69de29b..6330f772 100644 --- a/src/ZoneCommon/Game/IW4/ZoneConstantsIW4.h +++ b/src/ZoneCommon/Game/IW4/ZoneConstantsIW4.h @@ -0,0 +1,65 @@ +#pragma once +#include +#include + +#include "Zone/ZoneTypes.h" +#include "Game/IW4/IW4.h" + +namespace IW4 +{ + class ZoneConstants final + { + ZoneConstants() = default; + + public: + static constexpr const char* MAGIC_SIGNED_INFINITY_WARD = "IWff0100"; + static constexpr const char* MAGIC_SIGNED_OAT = "ABff0100"; + static constexpr const char* MAGIC_UNSIGNED = "IWffu100"; + static constexpr int ZONE_VERSION = 276; + + static constexpr const char* MAGIC_AUTH_HEADER = "IWffs100"; + inline static const uint8_t RSA_PUBLIC_KEY_INFINITY_WARD[] + { + 0x30, 0x82, 0x01, 0x0A, 0x02, 0x82, 0x01, 0x01, + 0x00, 0xA5, 0x86, 0xCC, 0x18, 0xA9, 0x12, 0x17, + 0x4F, 0x3A, 0xC9, 0x0C, 0xD2, 0x38, 0x5D, 0xDB, + 0x67, 0x62, 0xA4, 0xE3, 0xD4, 0x42, 0x05, 0x8A, + 0x57, 0x0C, 0x31, 0x4E, 0x19, 0xE4, 0xBA, 0x89, + 0x73, 0x13, 0xDB, 0x72, 0x25, 0x63, 0xB1, 0x2F, + 0xD7, 0xF1, 0x08, 0x48, 0x34, 0x06, 0xD7, 0x84, + 0x5F, 0xC8, 0xCF, 0x2F, 0xB6, 0xA3, 0x5A, 0x8F, + 0x7E, 0xAA, 0x9D, 0x51, 0xE7, 0x0F, 0xB9, 0x07, + 0xB7, 0x30, 0x91, 0x04, 0x39, 0x9C, 0xDC, 0x1C, + 0xF1, 0x16, 0xCB, 0x96, 0x10, 0xEB, 0x38, 0xB1, + 0x3B, 0xBA, 0x42, 0xE3, 0xE2, 0x78, 0xBD, 0x77, + 0x82, 0x1A, 0x2B, 0x54, 0x27, 0x0A, 0xF7, 0x66, + 0x06, 0xAD, 0x46, 0x39, 0xC0, 0xEB, 0xB5, 0xC2, + 0x27, 0xDD, 0x2C, 0x08, 0x62, 0x2C, 0x0B, 0xC4, + 0x00, 0x0D, 0xCB, 0xAD, 0x22, 0x67, 0x01, 0xA6, + 0x92, 0x9C, 0x00, 0xAF, 0x9D, 0x55, 0xCC, 0x68, + 0xEC, 0x39, 0x49, 0x85, 0x7E, 0x2C, 0x98, 0xCF, + 0x4C, 0x12, 0x8D, 0xED, 0xC7, 0x1D, 0x21, 0x54, + 0x9C, 0x2F, 0xC9, 0x54, 0x36, 0x08, 0xA9, 0x67, + 0xEE, 0x91, 0xE6, 0xD9, 0xB1, 0xFA, 0xA9, 0x2B, + 0x88, 0xAD, 0x2A, 0xD0, 0xAA, 0x28, 0xF9, 0x47, + 0xA6, 0x0F, 0xCF, 0x55, 0x4C, 0x9B, 0x26, 0x41, + 0x89, 0x76, 0x11, 0xFD, 0x1B, 0x83, 0xE4, 0xE8, + 0x8E, 0x7E, 0xB4, 0x03, 0xA3, 0x29, 0xDD, 0x4F, + 0xAC, 0x99, 0xBE, 0x7C, 0xD3, 0xFD, 0x14, 0x28, + 0x1C, 0x59, 0x69, 0xE0, 0x79, 0x5F, 0x4B, 0xDA, + 0x6B, 0xAB, 0x48, 0x4E, 0x28, 0x39, 0x84, 0xC6, + 0x2B, 0xC6, 0x20, 0x05, 0xDB, 0x05, 0x21, 0xC3, + 0xE1, 0xD4, 0x20, 0x28, 0xDD, 0x3A, 0x4D, 0x51, + 0xE7, 0x49, 0x8A, 0x49, 0xEF, 0xF5, 0xDA, 0xDA, + 0x7D, 0x5D, 0xA8, 0x0B, 0xA1, 0x77, 0xCD, 0x62, + 0x7D, 0x9D, 0x40, 0x26, 0x44, 0x4B, 0x3B, 0x0A, + 0x89, 0x02, 0x03, 0x01, 0x00, 0x01 + }; + + static constexpr size_t AUTHED_CHUNK_SIZE = 0x2000; + static constexpr unsigned AUTHED_CHUNK_COUNT_PER_GROUP = 256; + + static constexpr int OFFSET_BLOCK_BIT_COUNT = 4; + static constexpr block_t INSERT_BLOCK = XFILE_BLOCK_VIRTUAL; + }; +} diff --git a/src/ZoneLoading/Game/IW4/ZoneLoaderFactoryIW4.cpp b/src/ZoneLoading/Game/IW4/ZoneLoaderFactoryIW4.cpp index e170de7b..74356cb6 100644 --- a/src/ZoneLoading/Game/IW4/ZoneLoaderFactoryIW4.cpp +++ b/src/ZoneLoading/Game/IW4/ZoneLoaderFactoryIW4.cpp @@ -11,6 +11,7 @@ #include "Game/IW4/GameAssetPoolIW4.h" #include "Game/IW4/GameIW4.h" #include "Game/GameLanguage.h" +#include "Game/IW4/ZoneConstantsIW4.h" #include "Loading/Processor/ProcessorAuthedBlocks.h" #include "Loading/Processor/ProcessorCaptureData.h" #include "Loading/Processor/ProcessorInflate.h" @@ -26,58 +27,8 @@ #include "Loading/Steps/StepRemoveProcessor.h" #include "Loading/Steps/StepVerifyHash.h" - using namespace IW4; -const std::string ZoneLoaderFactory::MAGIC_SIGNED_INFINITY_WARD = "IWff0100"; -const std::string ZoneLoaderFactory::MAGIC_UNSIGNED = "IWffu100"; -const int ZoneLoaderFactory::VERSION = 276; - -const std::string ZoneLoaderFactory::MAGIC_AUTH_HEADER = "IWffs100"; -const uint8_t ZoneLoaderFactory::RSA_PUBLIC_KEY_INFINITY_WARD[] -{ - 0x30, 0x82, 0x01, 0x0A, 0x02, 0x82, 0x01, 0x01, - 0x00, 0xA5, 0x86, 0xCC, 0x18, 0xA9, 0x12, 0x17, - 0x4F, 0x3A, 0xC9, 0x0C, 0xD2, 0x38, 0x5D, 0xDB, - 0x67, 0x62, 0xA4, 0xE3, 0xD4, 0x42, 0x05, 0x8A, - 0x57, 0x0C, 0x31, 0x4E, 0x19, 0xE4, 0xBA, 0x89, - 0x73, 0x13, 0xDB, 0x72, 0x25, 0x63, 0xB1, 0x2F, - 0xD7, 0xF1, 0x08, 0x48, 0x34, 0x06, 0xD7, 0x84, - 0x5F, 0xC8, 0xCF, 0x2F, 0xB6, 0xA3, 0x5A, 0x8F, - 0x7E, 0xAA, 0x9D, 0x51, 0xE7, 0x0F, 0xB9, 0x07, - 0xB7, 0x30, 0x91, 0x04, 0x39, 0x9C, 0xDC, 0x1C, - 0xF1, 0x16, 0xCB, 0x96, 0x10, 0xEB, 0x38, 0xB1, - 0x3B, 0xBA, 0x42, 0xE3, 0xE2, 0x78, 0xBD, 0x77, - 0x82, 0x1A, 0x2B, 0x54, 0x27, 0x0A, 0xF7, 0x66, - 0x06, 0xAD, 0x46, 0x39, 0xC0, 0xEB, 0xB5, 0xC2, - 0x27, 0xDD, 0x2C, 0x08, 0x62, 0x2C, 0x0B, 0xC4, - 0x00, 0x0D, 0xCB, 0xAD, 0x22, 0x67, 0x01, 0xA6, - 0x92, 0x9C, 0x00, 0xAF, 0x9D, 0x55, 0xCC, 0x68, - 0xEC, 0x39, 0x49, 0x85, 0x7E, 0x2C, 0x98, 0xCF, - 0x4C, 0x12, 0x8D, 0xED, 0xC7, 0x1D, 0x21, 0x54, - 0x9C, 0x2F, 0xC9, 0x54, 0x36, 0x08, 0xA9, 0x67, - 0xEE, 0x91, 0xE6, 0xD9, 0xB1, 0xFA, 0xA9, 0x2B, - 0x88, 0xAD, 0x2A, 0xD0, 0xAA, 0x28, 0xF9, 0x47, - 0xA6, 0x0F, 0xCF, 0x55, 0x4C, 0x9B, 0x26, 0x41, - 0x89, 0x76, 0x11, 0xFD, 0x1B, 0x83, 0xE4, 0xE8, - 0x8E, 0x7E, 0xB4, 0x03, 0xA3, 0x29, 0xDD, 0x4F, - 0xAC, 0x99, 0xBE, 0x7C, 0xD3, 0xFD, 0x14, 0x28, - 0x1C, 0x59, 0x69, 0xE0, 0x79, 0x5F, 0x4B, 0xDA, - 0x6B, 0xAB, 0x48, 0x4E, 0x28, 0x39, 0x84, 0xC6, - 0x2B, 0xC6, 0x20, 0x05, 0xDB, 0x05, 0x21, 0xC3, - 0xE1, 0xD4, 0x20, 0x28, 0xDD, 0x3A, 0x4D, 0x51, - 0xE7, 0x49, 0x8A, 0x49, 0xEF, 0xF5, 0xDA, 0xDA, - 0x7D, 0x5D, 0xA8, 0x0B, 0xA1, 0x77, 0xCD, 0x62, - 0x7D, 0x9D, 0x40, 0x26, 0x44, 0x4B, 0x3B, 0x0A, - 0x89, 0x02, 0x03, 0x01, 0x00, 0x01 -}; - -const size_t ZoneLoaderFactory::AUTHED_CHUNK_SIZE = 0x2000; -const size_t ZoneLoaderFactory::AUTHED_CHUNK_COUNT_PER_GROUP = 256; - -const int ZoneLoaderFactory::OFFSET_BLOCK_BIT_COUNT = 4; -const block_t ZoneLoaderFactory::INSERT_BLOCK = XFILE_BLOCK_VIRTUAL; - class ZoneLoaderFactory::Impl { static GameLanguage GetZoneLanguage(std::string& zoneName) @@ -90,19 +41,19 @@ class ZoneLoaderFactory::Impl assert(isSecure != nullptr); assert(isOfficial != nullptr); - if (header.m_version != VERSION) + if (header.m_version != ZoneConstants::ZONE_VERSION) { return false; } - if (!memcmp(header.m_magic, MAGIC_SIGNED_INFINITY_WARD.c_str(), 8)) + if (!memcmp(header.m_magic, ZoneConstants::MAGIC_SIGNED_INFINITY_WARD, 8)) { *isSecure = true; *isOfficial = true; return true; } - if (!memcmp(header.m_magic, MAGIC_UNSIGNED.c_str(), 8)) + if (!memcmp(header.m_magic, ZoneConstants::MAGIC_UNSIGNED, 8)) { *isSecure = false; *isOfficial = true; @@ -135,7 +86,7 @@ class ZoneLoaderFactory::Impl auto* rsa = Crypto::CreateRSA(IPublicKeyAlgorithm::HashingAlgorithm::RSA_HASH_SHA256, Crypto::RSAPaddingMode::RSA_PADDING_PSS); - if (!rsa->SetKey(RSA_PUBLIC_KEY_INFINITY_WARD, sizeof(RSA_PUBLIC_KEY_INFINITY_WARD))) + if (!rsa->SetKey(ZoneConstants::RSA_PUBLIC_KEY_INFINITY_WARD, sizeof(ZoneConstants::RSA_PUBLIC_KEY_INFINITY_WARD))) { printf("Invalid public key for signature checking\n"); @@ -164,7 +115,7 @@ class ZoneLoaderFactory::Impl // If file is signed setup a RSA instance. IPublicKeyAlgorithm* rsa = SetupRSA(isOfficial); - zoneLoader->AddLoadingStep(std::make_unique(MAGIC_AUTH_HEADER.c_str())); + zoneLoader->AddLoadingStep(std::make_unique(ZoneConstants::MAGIC_AUTH_HEADER)); zoneLoader->AddLoadingStep(std::make_unique(4)); // Skip reserved auto subHeaderHash = std::make_unique(sizeof DB_AuthHash::bytes, 1); @@ -192,10 +143,10 @@ class ZoneLoaderFactory::Impl zoneLoader->AddLoadingStep(std::make_unique(std::unique_ptr(Crypto::CreateSHA256()), 0, subHeaderHashPtr, subHeaderCapturePtr)); // Skip the rest of the first chunk - zoneLoader->AddLoadingStep(std::make_unique(AUTHED_CHUNK_SIZE - sizeof(DB_AuthHeader))); + zoneLoader->AddLoadingStep(std::make_unique(ZoneConstants::AUTHED_CHUNK_SIZE - sizeof(DB_AuthHeader))); zoneLoader->AddLoadingStep(std::make_unique(std::make_unique( - AUTHED_CHUNK_COUNT_PER_GROUP, AUTHED_CHUNK_SIZE, std::extent::value, + ZoneConstants::AUTHED_CHUNK_COUNT_PER_GROUP, ZoneConstants::AUTHED_CHUNK_SIZE, std::extent::value, std::unique_ptr(Crypto::CreateSHA256()), masterBlockHashesPtr))); } @@ -228,7 +179,7 @@ public: // Add steps for loading the auth header which also contain the signature of the zone if it is signed. AddAuthHeaderSteps(isSecure, isOfficial, zoneLoader, fileName); - zoneLoader->AddLoadingStep(std::make_unique(std::make_unique(AUTHED_CHUNK_SIZE))); + zoneLoader->AddLoadingStep(std::make_unique(std::make_unique(ZoneConstants::AUTHED_CHUNK_SIZE))); // Start of the XFile struct zoneLoader->AddLoadingStep(std::make_unique(8)); @@ -236,7 +187,7 @@ public: zoneLoader->AddLoadingStep(std::make_unique()); // Start of the zone content - zoneLoader->AddLoadingStep(std::make_unique(std::make_unique(), zone, OFFSET_BLOCK_BIT_COUNT, INSERT_BLOCK)); + zoneLoader->AddLoadingStep(std::make_unique(std::make_unique(), zone, ZoneConstants::OFFSET_BLOCK_BIT_COUNT, ZoneConstants::INSERT_BLOCK)); // Return the fully setup zoneloader return zoneLoader; diff --git a/src/ZoneLoading/Game/IW4/ZoneLoaderFactoryIW4.h b/src/ZoneLoading/Game/IW4/ZoneLoaderFactoryIW4.h index 92187ae1..636fd84a 100644 --- a/src/ZoneLoading/Game/IW4/ZoneLoaderFactoryIW4.h +++ b/src/ZoneLoading/Game/IW4/ZoneLoaderFactoryIW4.h @@ -7,19 +7,6 @@ namespace IW4 { class ZoneLoaderFactory final : public IZoneLoaderFactory { - static const std::string MAGIC_SIGNED_INFINITY_WARD; - static const std::string MAGIC_UNSIGNED; - static const int VERSION; - - static const std::string MAGIC_AUTH_HEADER; - static const uint8_t RSA_PUBLIC_KEY_INFINITY_WARD[]; - - static const size_t AUTHED_CHUNK_SIZE; - static const unsigned AUTHED_CHUNK_COUNT_PER_GROUP; - - static const int OFFSET_BLOCK_BIT_COUNT; - static const block_t INSERT_BLOCK; - class Impl; public: