swtor/ssn
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

🐛 Do not read beyond stream in decryptor

Browse source
This commit is contained in:
C-3PO 2018-07-05 02:39:17 +02:00
parent 26467816f0
commit 050f82b382
Signed by: c3po
GPG key ID: 62993C4BB4D86F24
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/ssn/streams/decryptStream.ts
View file

@ -8,16 +8,20 @@ export default function decryptStream(inputStream: stream.Readable, decryptionKe
read(size) { read(size) {
//There are 12 random bytes at the beginning, we need to use them to initialize the decryption keys, but we can ignore the decrypted bytes. //There are 12 random bytes at the beginning, we need to use them to initialize the decryption keys, but we can ignore the decrypted bytes.
if (!skippedRandomHeader) { if (!skippedRandomHeader) {
const encryptedHeader = inputStream.read(12); const encryptedHeader: Buffer = inputStream.read(12);
decryptChunk(encryptedHeader, decryptionKeys); decryptChunk(encryptedHeader, decryptionKeys);
skippedRandomHeader = true; skippedRandomHeader = true;
} }
//Decrypt chunk //Decrypt chunk
const encryptedChunk = inputStream.read(size); const encryptedChunk: Buffer = inputStream.read(size);
if (encryptedChunk === null) {
//If end has been reached, stop
this.push(null);
} else {
const decryptedChunk = decryptChunk(encryptedChunk, decryptionKeys); const decryptedChunk = decryptChunk(encryptedChunk, decryptionKeys);
this.push(decryptedChunk); this.push(decryptedChunk);
}
}, },
}); });