mirrors/CyberChef
1
0
Fork 0
mirror of https://github.com/gchq/CyberChef.git synced 2025-05-10 08:15:00 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reset Stream

Browse source
This commit is contained in:
h345983745 2019-08-24 18:35:50 +01:00
parent 41a080aee1
commit 54286784a7
1 changed files with 1 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/core/lib/Stream.mjs
View file

@ -105,47 +105,25 @@ export default class Stream {
bitBufLen = 0; bitBufLen = 0;
// Add remaining bits from current byte // Add remaining bits from current byte
console.log("Bit pos: " + this.bitPos.toString(2));
console.log("Pos: " + this.position.toString(2));
bitBuf = (this.bytes[this.position++] & bitMask(this.bitPos)) >>> this.bitPos; bitBuf = (this.bytes[this.position++] & bitMask(this.bitPos)) >>> this.bitPos;
bitBufLen = 8 - this.bitPos; bitBufLen = 8 - this.bitPos;
this.bitPos = 0; this.bitPos = 0;
console.log("Bit pos: " + this.bitPos.toString(2));
console.log("Bit buff: " + bitBuf.toString(2));
console.log("Bit buff len: " + bitBufLen.toString(2));
console.log("Num bits: " + numBits.toString(2));
// Not enough bits yet // Not enough bits yet
while (bitBufLen < numBits) { while (bitBufLen < numBits) {
bitBuf |= this.bytes[this.position++] << bitBufLen; bitBuf |= this.bytes[this.position++] << bitBufLen;
bitBufLen += 8; bitBufLen += 8;
} }
console.log("Pos: " + this.position.toString(2));
// Reverse back to numBits // Reverse back to numBits
if (bitBufLen > numBits) { if (bitBufLen > numBits) {
const excess = bitBufLen - numBits; const excess = bitBufLen - numBits;
console.log("Excess: " + excess.toString(2)); bitBuf &= (1 << numBits) - 1;
console.log("Bit buff: " + bitBuf.toString(2));
console.log("Mask: " + ((1 << numBits) - 1).toString(2));
//bitBuf &= (1 << numBits) - 1;
bitBuf &= 256 - (1 << numBits);
bitBuf = bitBuf >> excess;
bitBufLen -= excess; bitBufLen -= excess;
this.position--; this.position--;
this.bitPos = 8 - excess; this.bitPos = 8 - excess;
} }
console.log("Bit buff len: " + bitBufLen.toString(2));
console.log("Bit buff: " + bitBuf.toString(2));
console.log("Pos: " + this.position.toString(2));
return bitBuf; return bitBuf;
/** /**