Commit 7862d83a authored by hybrid's avatar hybrid

Fix some more types, now encryption works (just enable the define in IrrCompileConfig)

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@2964 dfc29bdd-3216-0410-991c-e03cc46cb475
parent ebc97594
...@@ -496,11 +496,11 @@ IReadFile* CZipReader::createAndOpenFile(u32 index) ...@@ -496,11 +496,11 @@ IReadFile* CZipReader::createAndOpenFile(u32 index)
{ {
os::Printer::log("Reading encrypted file."); os::Printer::log("Reading encrypted file.");
u8 salt[16]={0}; u8 salt[16]={0};
const u16 saltSize = (((e.header.Sig & 0x00ff0000) >>16)+1)*64; const u16 saltSize = (((e.header.Sig & 0x00ff0000) >>16)+1)*4;
File->seek(e.Offset); File->seek(e.Offset);
File->read(salt, saltSize); File->read(salt, saltSize);
c8 pwVerification[2]; char pwVerification[2];
c8 pwVerificationFile[2]; char pwVerificationFile[2];
File->read(pwVerification, 2); File->read(pwVerification, 2);
fcrypt_ctx zctx; // the encryption context fcrypt_ctx zctx; // the encryption context
const char* Password="0123456789"; const char* Password="0123456789";
...@@ -518,7 +518,7 @@ IReadFile* CZipReader::createAndOpenFile(u32 index) ...@@ -518,7 +518,7 @@ IReadFile* CZipReader::createAndOpenFile(u32 index)
} }
decryptedSize= e.header.DataDescriptor.CompressedSize-saltSize-12; decryptedSize= e.header.DataDescriptor.CompressedSize-saltSize-12;
decryptedBuf= new u8[decryptedSize]; decryptedBuf= new u8[decryptedSize];
u16 c = 0; u32 c = 0;
while ((c+32768)<=decryptedSize) while ((c+32768)<=decryptedSize)
{ {
File->read(decryptedBuf+c, 32768); File->read(decryptedBuf+c, 32768);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment