Expose module function and stuff for testing

RndPhrase · Oct 27, 2015 · 7ccec76 · 7ccec76
1 parent abef3b4
commit 7ccec76
Show file tree

Hide file tree

Showing 2 changed files with 86 additions and 69 deletions.
diff --git a/cubehash.js b/cubehash.js
@@ -17,7 +17,17 @@
     }
 }(this, function () {
     // Init vector was computed by 10r rounds as described in the specification
-    var init = [
+
+    var Cubehash = function(r, b, f, h) {
+        var self = this;
+        // Currently initialization is hardcoded to 10
+        // if (i == undefined) i = 16;
+        if (r == undefined) r = 1;
+        if (b == undefined) b = 32;
+        if (f == undefined) f = 10;
+        if (h == undefined) h = 8;
+
+        var init = [
             -2096419883, 658334063, -679114902, 1246757400,
             -1523021469, -289996037, 1196718146, 1168084361,
             -2027445816, -1170162360, -822837272, 625197683,
@@ -28,88 +38,94 @@
             19608647852, 9541915967, 5144979599, -4355863926
         ];
 
-    function rotate(a, b) {
-        return (a << b) | (a >>> (32 - b));
-    }
-
-    function intToHex(v) {
-        var s = '';
-
-        for (; v !== 0; v >>>= 8) {
-            s += ((v >> 4) & 0xF).toString(16) + (v & 0xF).toString(16);
+        self.rotate = function(a, b) {
+            return (a << b) | (a >>> (32 - b));
         }
 
-        while(s.length < 8) s = "0" + s;
+        self.intToHex = function(v) {
+            var s = '';
 
-        return s;
-    }
+            for (; v !== 0; v >>>= 8) {
+                s += ((v >> 4) & 0xF).toString(16) + (v & 0xF).toString(16);
+            }
 
-    function swap(arr, i, j) {
-        var tmp = arr[i];
-        arr[i] = arr[j];
-        arr[j] = tmp;
-        return arr;
-    }
+            while(s.length < 8) s = "0" + s;
 
-    function transform(state) {
-        var i, r,
-            y = new Array(16);
-
-        for (r = 0;r < 8; r += 1) {
-            for (i = 0; i < 16; i += 1) { state[i + 16] += y[i^8] = state[i]; }
-            for (i = 0; i < 16; i += 1) { state[i]       = rotate(y[i],  7)^state[i + 16]; }
-            for (i = 0; i < 16; i += 1) { y[i^2]         = state[i + 16]; }
-            for (i = 0; i < 16; i += 1) { state[i + 16]  = y[i] + state[i]; }
-            for (i = 0; i < 16; i += 1) { y[i^4]         = state[i]; }
-            for (i = 0; i < 16; i += 1) { state[i]       = rotate(y[i], 11)^state[i + 16]; }
-            for (i = 0; i < 16; i += 2) {
-                swap(state, i + 16, i + 17);
-            }
+            return s;
         }
 
-        for (i = 0; i < 16; i += 1) {
-            y[i] = 0;
+        self.swap = function(arr, i, j) {
+            var tmp = arr[i];
+            arr[i] = arr[j];
+            arr[j] = tmp;
+            return arr;
         }
-    }
 
-    function hash(data) {
-        // init state
-        var i,
-            s = '',
-            state = new Array(32);
+        self.transform = function(state) {
+            var i, r,
+                y = new Array(16);
+
+            for (r = 0;r < 8; r += 1) {
+                for (i = 0; i < 16; i += 1) { state[i + 16] += y[i^8] = state[i]; }
+                for (i = 0; i < 16; i += 1) { state[i]       = self.rotate(y[i],  7)^state[i + 16]; }
+                for (i = 0; i < 16; i += 1) { y[i^2]         = state[i + 16]; }
+                for (i = 0; i < 16; i += 1) { state[i + 16]  = y[i] + state[i]; }
+                for (i = 0; i < 16; i += 1) { y[i^4]         = state[i]; }
+                for (i = 0; i < 16; i += 1) { state[i]       = self.rotate(y[i], 11)^state[i + 16]; }
+                for (i = 0; i < 16; i += 2) {
+                    self.swap(state, i + 16, i + 17);
+                }
+            }
 
-        for (i = 0; i < 32; i += 1) {
-            state[i] = init[i];
+            for (i = 0; i < 16; i += 1) {
+                y[i] = 0;
+            }
         }
 
-        // update with data
-        data += String.fromCharCode(128);
+        self.hash = function(data) {
+            // init state
+            var i,
+                s = '',
+                state = new Array(32);
 
-        while(data.length % 32) {
-            data += String.fromCharCode(0)
-        }
+            for (i = 0; i < 32; i += 1) {
+                state[i] = init[i];
+            }
 
-        for (var i = 0; i < data.length; i += 32) {
-            var block = data.substr(i, 32);
-            for (var j = 0; j < 32; j++) {
-                state[j] ^= block.charCodeAt(j);
+            // update with data
+            data += String.fromCharCode(128);
+
+            while(data.length % 32) {
+                data += String.fromCharCode(0)
             }
-            transform(state);
-        }
 
-        // finalize
-        state[31] ^= 1;
+            for (var i = 0; i < data.length; i += b) {
+                var block = data.substr(i, b);
+                // XOR into state
+                for (var j = 0; j < b; j++) {
+                    state[j] ^= block.charCodeAt(j);
 
-        for (i = 0; i < 10; i += 1) {
-            transform(state);
-        }
+                }
 
-        // convert to hex
-        for (i = 0; i < 8; i += 1) {
-            s += intToHex(state[i]);
+                // Perform r identical rounds
+                for (var j = 0; j < r; j++){
+                    self.transform(state);
+                }
+            }
+
+            // finalize
+            state[31] ^= 1;
+            for (i = 0; i < f; i += 1) {
+                self.transform(state);
+            }
+
+            // convert to hex
+            for (i = 0; i < 8; i += 1) {
+                s += self.intToHex(state[i]);
+            }
+            return s;
         }
-        return s;
     }
 
-    return hash;
+    return Cubehash;
 }));
diff --git a/test/cubehash-test.js b/test/cubehash-test.js
@@ -1,25 +1,26 @@
 /*global describe, it*/
 
 var assert = require('assert'),
-    cubehash = require('../cubehash');
+    Cubehash = require('../cubehash');
 
 describe('cubehash', function () {
     it('Should be a function', function (done) {
-        assert.equal(typeof cubehash, 'function');
+        assert.equal(typeof Cubehash, 'function');
         done();
     });
 
     it('Should hash correctly', function (done) {
+        cubehash = new Cubehash();
         assert.equal(
-            cubehash(''),
+            cubehash.hash(''),
             '38d1e8a22d7baac6fd5262d83de89cacf784a02caa866335299987722aeabc59'
         );
         assert.equal(
-            cubehash('Hello'),
+            cubehash.hash('Hello'),
             '011f92d0c9418d9cbf59cb1c709b8fb40efcf7c48e735a1436c0a6e72d337e6c'
         );
         assert.equal(
-            cubehash('The quick brown fox jumps over the lazy dog'),
+            cubehash.hash('The quick brown fox jumps over the lazy dog'),
             '9096bfd8082d5a31facac9b4de6615bdd5596389832ca3058abc97377b58aa94'
         );
         done();