mirrors/CyberChef
1
0
Fork 0
mirror of https://github.com/gchq/CyberChef.git synced 2025-07-04 03:42:23 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/PenguinGeorge/CyberChef

Browse source
This commit is contained in:
George J 2018-05-01 17:02:49 +01:00
commit 6f53a791af
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/core/operations/BitwiseOp.js
View file

@ -35,7 +35,6 @@ const BitwiseOp = {
if (scheme === "Cascade") k = input[i + 1] || 0; if (scheme === "Cascade") k = input[i + 1] || 0;
o = input[i]; o = input[i];
x = nullPreserving && (o === 0 || o === k) ? o : func(o, k); x = nullPreserving && (o === 0 || o === k) ? o : func(o, k);
result.push(x);
if (scheme && if (scheme &&
scheme !== "Standard" && scheme !== "Standard" &&
!(nullPreserving && (o === 0 || o === k))) { !(nullPreserving && (o === 0 || o === k))) {
@ -46,8 +45,13 @@ const BitwiseOp = {
case "Output differential": case "Output differential":
key[i % key.length] = o; key[i % key.length] = o;
break; break;
case "Cascade":
k ^= input[i + 1];
x = nullPreserving && (o === 0 || o === k) ? o : func(o, k);
break;
} }
} }
result.push(x);
} }
return result; return result;