diff --git a/IGA.ts b/IGA.ts index 5e0a61c..908351d 100644 --- a/IGA.ts +++ b/IGA.ts @@ -223,7 +223,6 @@ function hash(input: string, salt: number = 0, len: number = 32, seed?: number): hsh += bin2hex(crc) hashes.push(hsh) } - //console.log(hashes); if (hashes.length == 1) { return hashes[0] } else { @@ -268,10 +267,6 @@ function verifyHash(input: string, inHash: string, salt: number = 0, len: number } } -/*let hsh = hash("test") -console.log(hsh) -console.log(verifyHash("test", hsh))*/ - export default { hash, verifyHash diff --git a/collision_test1.ts b/collision_test1.ts index db21b90..6e72d03 100644 --- a/collision_test1.ts +++ b/collision_test1.ts @@ -26,7 +26,7 @@ async function bruteForce(pos) { } if (pos == state.length - 1) { let hash1 = IGA.hash(state.join("")) - let hash2 = IGA.hash(state.join(""), 0, 32, 32, 32768) + let hash2 = IGA.hash(state.join(""), 0, 32, 32768) if (seen[hash1] != undefined) { collisions.push({ hash: hash1, diff --git a/collision_test2.ts b/collision_test2.ts index cbbe74a..91a56bd 100644 --- a/collision_test2.ts +++ b/collision_test2.ts @@ -31,7 +31,7 @@ async function main() { failCount = 0 let hash1 = IGA.hash(str) h = hash1 - let hash2 = IGA.hash(str, 0, 32, 32, 32768) + let hash2 = IGA.hash(str, 0, 32, 32768) if (seen[hash1] != undefined) { collisions.push({ hash: hash1, diff --git a/hash.ts b/hash.ts index 97ef32f..f9739ba 100644 --- a/hash.ts +++ b/hash.ts @@ -23,10 +23,9 @@ if (args[0] == "hash") { } let fileData = fs.readFileSync(args[1], 'utf8'); let salt = args[2] ? parseInt(args[2]) : 0 - let iterations = args[3] ? parseInt(args[3]) : 32 let len = args[4] ? parseInt(args[4]) : 32 try { - let hash = IGA.hash(fileData, salt, iterations, len) + let hash = IGA.hash(fileData, salt, len) console.log(hash) } catch (e) { console.error("Error while creating hash: " + e.stack) @@ -44,10 +43,9 @@ if (args[0] == "hash") { let fileData = fs.readFileSync(args[1], 'utf8'); let hashToVerify = args[2] let salt = args[3] ? parseInt(args[3]) : 0 - let iterations = args[4] ? parseInt(args[4]) : 32 let len = args[5] ? parseInt(args[5]) : 32 try { - let verify = IGA.verifyHash(fileData, hashToVerify, salt, iterations, len) + let verify = IGA.verifyHash(fileData, hashToVerify, salt, len) if (verify.valid) { console.log("Hash is valid!") } else {