Tidied up Streebog operation, splitting out GOST hash into a separate op.

This commit is contained in:
n1474335 2019-07-03 17:23:45 +01:00
parent 666c447e36
commit 99f4091c1a
11 changed files with 33 additions and 77 deletions

View file

@ -6,8 +6,8 @@
import Operation from "../Operation";
import OperationError from "../errors/OperationError";
import GostCoding from "../vendor/streebog/gostCoding";
import GostDigest from "../vendor/streebog/gostDigest";
import GostDigest from "../vendor/gost/gostDigest";
import {toHexFast} from "../lib/Hex";
/**
* Streebog operation
@ -21,37 +21,14 @@ class Streebog extends Operation {
super();
this.name = "Streebog";
this.module = "Crypto";
this.description = "Streebog is a cryptographic hash function defined in the Russian national standard GOST R 34.11-2012 Information Technology \u2013 Cryptographic Information Security \u2013 Hash Function. It was created to replace an obsolete GOST hash function defined in the old standard GOST R 34.11-94, and as an asymmetric reply to SHA-3 competition by the US National Institute of Standards and Technology.";
this.infoURL = "https://en.wikipedia.org/wiki/Streebog";
this.inputType = "string";
this.module = "Hashing";
this.description = "Streebog is a cryptographic hash function defined in the Russian national standard GOST R 34.11-2012 <i>Information Technology \u2013 Cryptographic Information Security \u2013 Hash Function</i>. It was created to replace an obsolete GOST hash function defined in the old standard GOST R 34.11-94, and as an asymmetric reply to SHA-3 competition by the US National Institute of Standards and Technology.";
this.infoURL = "https://wikipedia.org/wiki/Streebog";
this.inputType = "ArrayBuffer";
this.outputType = "string";
this.args = [
{
"name": "Version",
"type": "option",
"value": ["2012", "1994"]
},
// Paramset sBox for GOST 28147-89. Used only if version = 1994
{
"name": "S-Box",
"type": "option",
"value": [
"D-A",
"D-SC",
"E-TEST",
"E-A",
"E-B",
"E-C",
"E-D",
"E-SC",
"E-Z",
"D-TEST"
]
},
// 512 bits digest, valid only for algorithm "Streebog"
{
"name": "Length",
"name": "Size",
"type": "option",
"value": ["256", "512"]
}
@ -59,34 +36,22 @@ class Streebog extends Operation {
}
/**
* @param {string} input
* @param {ArrayBuffer} input
* @param {Object[]} args
* @returns {string}
*/
run(input, args) {
try {
const version = parseInt(args[0], 10);
let sBox = args[1];
let length = parseInt(args[2], 10);
const length = parseInt(args[0], 10);
const gostDigest = new GostDigest({
name: "GOST R 34.11",
version: 2012,
length: length
});
// 1994 old-style 256 bits digest based on GOST 28147-89
if (version === 1994) {
length = 256;
}
if (version === 2012) {
sBox = "";
}
const gostDigest = new GostDigest({name: "GOST R 34.11", version, sBox, length });
const gostCoding = new GostCoding();
const decode = gostCoding.Chars.decode(input);
const hexEncode = gostCoding.Hex.encode(gostDigest.digest(decode));
return hexEncode.replace(/[^\-A-Fa-f0-9]/g, "").toLowerCase();
return toHexFast(gostDigest.digest(input));
} catch (err) {
throw new OperationError(`Invalid Input, Details ${err.message}`);
throw new OperationError(err);
}
}