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

Fixing the babel, scrypt, and base58 issues

Browse source
This commit is contained in:
Brian Whitney 2018-10-21 21:10:49 -04:00
parent 5155d0ed56
commit f4de4de8c1
5 changed files with 40 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/core/operations/FromBase58.mjs
View file

@ -71,6 +71,11 @@ class FromBase58 extends Operation {
if (input.length === 0) return [];
let zeroPrefix = 0;
for (let i = 0; i < input.length && input[i] === alphabet[0]; i++) {
zeroPrefix++;
}
[].forEach.call(input, function(c, charIndex) {
const index = alphabet.indexOf(c);
@ -98,6 +103,11 @@ class FromBase58 extends Operation {
}
});
while (zeroPrefix > 0) {
result.push(0);
zeroPrefix--;
}
return result.reverse();
}

2
src/core/operations/Scrypt.mjs
View file

@ -62,7 +62,7 @@ class Scrypt extends Operation {
* @returns {string}
*/
run(input, args) {
const salt = Utils.convertToByteString(args[0].string || "", args[0].option),
const salt = Buffer.from(Utils.convertToByteArray(args[0].string || "", args[0].option)),
iterations = args[1],
memFactor = args[2],
parallelFactor = args[3],

7
src/core/operations/ToBase58.mjs
View file

@ -53,6 +53,11 @@ class ToBase58 extends Operation {
if (input.length === 0) return "";
let zeroPrefix = 0;
for (let i = 0; i < input.length && input[i] === 0; i++) {
zeroPrefix++;
}
input.forEach(function(b) {
let carry = (result[0] << 8) + b;
result[0] = carry % 58;
@ -74,7 +79,7 @@ class ToBase58 extends Operation {
return alphabet[b];
}).reverse().join("");
while (result.length < input.length) {
while (zeroPrefix--) {
result = alphabet[0] + result;
}