OU/CWE-ou-minkata
2
3
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-14 10:37:41 -04:00
Code Releases Activity

Allow plSecureStream to open any arbitrary hsStream in read-only mode

Browse Source
This commit is contained in:
Adam Johnson
2012-01-07 23:55:23 -05:00
parent 3508df1c16
commit 83ff761632
2 changed files with 60 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
Sources/Plasma/PubUtilLib/plFile/plSecureStream.cpp
View File

@ -77,6 +77,22 @@ fDeleteOnExit(deleteOnExit)
memcpy(&fKey, &kDefaultKey, sizeof(kDefaultKey));
}
plSecureStream::plSecureStream(hsStream* base, UInt32* key) :
fRef(INVALID_HANDLE_VALUE),
fActualFileSize(0),
fBufferedStream(false),
fRAMStream(nil),
fWriteFileName(nil),
fOpenMode(kOpenFail),
fDeleteOnExit(false)
{
if (key)
memcpy(&fKey, key, sizeof(kDefaultKey));
else
memcpy(&fKey, &kDefaultKey, sizeof(kDefaultKey));
Open(base);
}
plSecureStream::~plSecureStream()
{
}
@ -232,6 +248,39 @@ hsBool plSecureStream::Open(const wchar* name, const wchar* mode)
}
}
hsBool plSecureStream::Open(hsStream* stream)
{
UInt32 pos = stream->GetPosition();
stream->Rewind();
if (!ICheckMagicString(stream))
return false;
fActualFileSize = stream->ReadLE32();
UInt32 trimSize = kMagicStringLen + sizeof(UInt32) + fActualFileSize;
fRAMStream = new hsRAMStream;
while (!stream->AtEnd())
{
// Don't write out any garbage
UInt32 size;
if ((trimSize - stream->GetPosition()) < kEncryptChunkSize)
size = (trimSize - stream->GetPosition());
else
size = kEncryptChunkSize;
UInt8 buf[kEncryptChunkSize];
stream->Read(kEncryptChunkSize, &buf);
IDecipher((UInt32*)&buf, kEncryptChunkSize / sizeof(UInt32));
fRAMStream->Write(size, &buf);
}
stream->SetPosition(pos);
fRAMStream->Rewind();
fPosition = 0;
fBufferedStream = true;
fOpenMode = kOpenRead;
return true;
}
hsBool plSecureStream::Close()
{
int rtn = false;
@ -598,6 +647,14 @@ bool plSecureStream::FileDecrypt(const wchar* fileName, UInt32* key /* = nil */)
return true;
}
bool plSecureStream::ICheckMagicString(hsStream* s)
{
char magicString[kMagicStringLen+1];
s->Read(kMagicStringLen, &magicString);
magicString[kMagicStringLen] = '\0';
return (hsStrEQ(magicString, kMagicString) != 0);
}
bool plSecureStream::ICheckMagicString(hsFD fp)
{
char magicString[kMagicStringLen+1];

3
Sources/Plasma/PubUtilLib/plFile/plSecureStream.h
View File

@ -85,13 +85,16 @@ protected:
bool IWriteEncrypted(hsStream* sourceStream, const wchar* outputFile);
static bool ICheckMagicString(hsFD fp);
static bool ICheckMagicString(hsStream* s);
public:
plSecureStream(hsBool deleteOnExit = false, UInt32* key = nil); // uses default key if you don't pass one in
plSecureStream(hsStream* base, UInt32* key = nil);
~plSecureStream();
virtual hsBool Open(const char* name, const char* mode = "rb");
virtual hsBool Open(const wchar* name, const wchar* mode = L"rb");
hsBool Open(hsStream* stream);
virtual hsBool Close();
virtual UInt32 Read(UInt32 byteCount, void* buffer);