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

Streaming decrypt old-format packets

Browse Source
This commit is contained in:
Daniel Huigens 2018-05-25 19:23:09 +02:00
parent 9fcc075f0b
commit ead3ddd706
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/packet/packet.js
View File

@ -169,6 +169,7 @@ export default {
packet_length_type = headerByte & 0x03; // bit 1-0
}
const streaming = this.supportsStreaming(tag);
let packet = null;
if (!format) {
// 4.2.1. Old Format Packet Lengths
@ -204,7 +205,6 @@ export default {
break;
}
} else { // 4.2.2. New Format Packet Lengths
const streaming = this.supportsStreaming(tag);
let wasPartialLength;
do {
// 4.2.2.1. One-Octet Lengths
@ -235,26 +235,26 @@ export default {
packet_length = (await reader.readByte() << 24) | (await reader.readByte() << 16) | (await reader.readByte() <<
8) | await reader.readByte();
}
if (streaming) {
if (controller) {
controller.enqueue(await reader.readBytes(packet_length));
} else {
// Send the remainder of the packet to the callback as a stream
reader.releaseLock();
packet = stream.subarray(stream.clone(input), 0, packet_length);
await callback({ tag, packet });
// Read the entire packet before parsing the next one
reader = stream.getReader(input);
await reader.readBytes(packet_length);
}
if (controller) {
controller.enqueue(await reader.readBytes(packet_length));
}
} while(wasPartialLength);
}
if (!packet) {
packet = await reader.readBytes(packet_length);
await callback({ tag, packet });
if (streaming) {
// Send the remainder of the packet to the callback as a stream
reader.releaseLock();
packet = stream.subarray(stream.clone(input), 0, packet_length);
await callback({ tag, packet });
// Read the entire packet before parsing the next one
reader = stream.getReader(input);
await reader.readBytes(packet_length);
} else {
packet = await reader.readBytes(packet_length);
await callback({ tag, packet });
}
} else if (controller) {
controller.close();
}