suzanne.soy/fork-openpgpjs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix queued bytes calculation for AEAD concurrency

Browse Source
This commit is contained in:
Daniel Huigens 2019-10-16 13:47:56 +02:00
parent 08b7725b8c
commit a06bf91f35
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/packet/sym_encrypted_aead_protected.js
View File

@ -124,6 +124,7 @@ SymEncryptedAEADProtected.prototype.crypt = async function (fn, key, data, strea
const mode = crypto[enums.read(enums.aead, this.aeadAlgo)]; const mode = crypto[enums.read(enums.aead, this.aeadAlgo)];
const modeInstance = await mode(cipher, key); const modeInstance = await mode(cipher, key);
const tagLengthIfDecrypting = fn === 'decrypt' ? mode.tagLength : 0; const tagLengthIfDecrypting = fn === 'decrypt' ? mode.tagLength : 0;
const tagLengthIfEncrypting = fn === 'encrypt' ? mode.tagLength : 0;
const chunkSize = 2 ** (this.chunkSizeByte + 6) + tagLengthIfDecrypting; // ((uint64_t)1 << (c + 6)) const chunkSize = 2 ** (this.chunkSizeByte + 6) + tagLengthIfDecrypting; // ((uint64_t)1 << (c + 6))
const adataBuffer = new ArrayBuffer(21); const adataBuffer = new ArrayBuffer(21);
const adataArray = new Uint8Array(adataBuffer, 0, 13); const adataArray = new Uint8Array(adataBuffer, 0, 13);
@ -154,21 +155,22 @@ SymEncryptedAEADProtected.prototype.crypt = async function (fn, key, data, strea
if (!chunkIndex || chunk.length) { if (!chunkIndex || chunk.length) {
reader.unshift(finalChunk); reader.unshift(finalChunk);
cryptedPromise = modeInstance[fn](chunk, mode.getNonce(iv, chunkIndexArray), adataArray); cryptedPromise = modeInstance[fn](chunk, mode.getNonce(iv, chunkIndexArray), adataArray);
queuedBytes += chunk.length - tagLengthIfDecrypting + tagLengthIfEncrypting;
} else { } else {
// After the last chunk, we either encrypt a final, empty // After the last chunk, we either encrypt a final, empty
// data chunk to get the final authentication tag or // data chunk to get the final authentication tag or
// validate that final authentication tag. // validate that final authentication tag.
adataView.setInt32(13 + 4, cryptedBytes); // Should be setInt64(13, ...) adataView.setInt32(13 + 4, cryptedBytes); // Should be setInt64(13, ...)
cryptedPromise = modeInstance[fn](finalChunk, mode.getNonce(iv, chunkIndexArray), adataTagArray); cryptedPromise = modeInstance[fn](finalChunk, mode.getNonce(iv, chunkIndexArray), adataTagArray);
queuedBytes += tagLengthIfEncrypting;
done = true; done = true;
} }
cryptedBytes += chunk.length - tagLengthIfDecrypting; cryptedBytes += chunk.length - tagLengthIfDecrypting;
queuedBytes += chunk.length - tagLengthIfDecrypting;
// eslint-disable-next-line no-loop-func // eslint-disable-next-line no-loop-func
latestPromise = latestPromise.then(() => cryptedPromise).then(async crypted => { latestPromise = latestPromise.then(() => cryptedPromise).then(async crypted => {
await writer.ready; await writer.ready;
await writer.write(crypted); await writer.write(crypted);
queuedBytes -= chunk.length; queuedBytes -= crypted.length;
}).catch(err => writer.abort(err)); }).catch(err => writer.abort(err));
if (done || queuedBytes > writer.desiredSize) { if (done || queuedBytes > writer.desiredSize) {
await latestPromise; // Respect backpressure await latestPromise; // Respect backpressure