Browse Source

Fix encryption ASSumption

Now we test the file we're trying to write to. We still support legacy
xTEA BriceIsSmart/whatdoyousee files, but we will always make new files
unencrypted.
Adam Johnson 12 years ago
parent
commit
8d8532f045
  1. 6
      Sources/Plasma/PubUtilLib/plFile/plEncryptedStream.cpp

6
Sources/Plasma/PubUtilLib/plFile/plEncryptedStream.cpp

@ -562,7 +562,6 @@ hsStream* plEncryptedStream::OpenEncryptedFile(const wchar_t* fileName, uint32_t
else else
s = new hsUNIXStream; s = new hsUNIXStream;
if (s)
s->Open(fileName, L"rb"); s->Open(fileName, L"rb");
return s; return s;
} }
@ -578,11 +577,10 @@ hsStream* plEncryptedStream::OpenEncryptedFileWrite(const char* fileName, uint32
hsStream* plEncryptedStream::OpenEncryptedFileWrite(const wchar_t* fileName, uint32_t* cryptKey) hsStream* plEncryptedStream::OpenEncryptedFileWrite(const wchar_t* fileName, uint32_t* cryptKey)
{ {
hsStream* s = nil; hsStream* s = nil;
#ifdef PLASMA_EXTERNAL_RELEASE if (IsEncryptedFile(fileName))
s = new plEncryptedStream(cryptKey); s = new plEncryptedStream(cryptKey);
#else else
s = new hsUNIXStream; s = new hsUNIXStream;
#endif
s->Open(fileName, L"wb"); s->Open(fileName, L"wb");
return s; return s;

Loading…
Cancel
Save