mirrors/rpcs3
0
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-08-08 01:00:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix gcc compile...

Browse source
This commit is contained in:
Aishou 2014-03-03 14:51:54 +01:00
commit 354cf24302
1 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

24
rpcs3/Crypto/unself.h
View file

@ -205,7 +205,7 @@ struct ControlInfo
for (int i = 0; i < 20; i++) for (int i = 0; i < 20; i++)
digest_str += wxString::Format("%02x", file_digest_30.digest[i]); digest_str += wxString::Format("%02x", file_digest_30.digest[i]);
ConLog.Write("Digest: %s", digest_str); ConLog.Write("Digest: %s", digest_str.wc_str());
ConLog.Write("Unknown: 0x%llx", file_digest_30.unknown); ConLog.Write("Unknown: 0x%llx", file_digest_30.unknown);
} }
else if (size == 0x40) else if (size == 0x40)
@ -218,8 +218,8 @@ struct ControlInfo
digest_str2 += wxString::Format("%02x", file_digest_40.digest2[i]); digest_str2 += wxString::Format("%02x", file_digest_40.digest2[i]);
} }
ConLog.Write("Digest1: %s", digest_str1); ConLog.Write("Digest1: %s", digest_str1.wc_str());
ConLog.Write("Digest2: %s", digest_str2); ConLog.Write("Digest2: %s", digest_str2.wc_str());
ConLog.Write("Unknown: 0x%llx", file_digest_40.unknown); ConLog.Write("Unknown: 0x%llx", file_digest_40.unknown);
} }
} }
@ -242,10 +242,10 @@ struct ControlInfo
ConLog.Write("Unknown1: 0x%08x", npdrm.unknown1); ConLog.Write("Unknown1: 0x%08x", npdrm.unknown1);
ConLog.Write("License: 0x%08x", npdrm.license); ConLog.Write("License: 0x%08x", npdrm.license);
ConLog.Write("Type: 0x%08x", npdrm.type); ConLog.Write("Type: 0x%08x", npdrm.type);
ConLog.Write("ContentID: %s", contentid_str); ConLog.Write("ContentID: %s", contentid_str.wc_str());
ConLog.Write("Digest: %s", digest_str); ConLog.Write("Digest: %s", digest_str.wc_str());
ConLog.Write("Inverse digest: %s", invdigest_str); ConLog.Write("Inverse digest: %s", invdigest_str.wc_str());
ConLog.Write("XOR digest: %s", xordigest_str); ConLog.Write("XOR digest: %s", xordigest_str.wc_str());
ConLog.Write("Unknown2: 0x%llx", npdrm.unknown2); ConLog.Write("Unknown2: 0x%llx", npdrm.unknown2);
ConLog.Write("Unknown3: 0x%llx", npdrm.unknown3); ConLog.Write("Unknown3: 0x%llx", npdrm.unknown3);
} }
@ -282,10 +282,10 @@ struct MetadataInfo
iv_pad_str += wxString::Format("%02x", iv_pad[i]); iv_pad_str += wxString::Format("%02x", iv_pad[i]);
} }
ConLog.Write("Key: %s", key_str); ConLog.Write("Key: %s", key_str.wc_str());
ConLog.Write("Key pad: %s", key_pad_str); ConLog.Write("Key pad: %s", key_pad_str.wc_str());
ConLog.Write("IV: %s", iv_str); ConLog.Write("IV: %s", iv_str.wc_str());
ConLog.Write("IV pad: %s", iv_pad_str); ConLog.Write("IV pad: %s", iv_pad_str.wc_str());
} }
}; };
@ -505,4 +505,4 @@ public:
extern bool IsSelf(const std::string& path); extern bool IsSelf(const std::string& path);
extern bool IsSelfElf32(const std::string& path); extern bool IsSelfElf32(const std::string& path);
extern bool CheckDebugSelf(const std::string& self, const std::string& elf); extern bool CheckDebugSelf(const std::string& self, const std::string& elf);
extern bool DecryptSelf(const std::string& elf, const std::string& self); extern bool DecryptSelf(const std::string& elf, const std::string& self);