test both imported version and one with this library

Author: calvinmetcalf

package.json

@@ -19,8 +19,8 @@
     "browserify-aes": "0.8.1",
     "browserify-sign": "2.8.0",
     "create-ecdh": "1.0.3",
-    "create-hash": "^1.0.2",
-    "create-hmac": "^1.0.2",
+    "create-hash": "^1.1.0",
+    "create-hmac": "^1.1.0",
     "diffie-hellman": "2.2.3",
     "inherits": "^2.0.1",
     "pbkdf2-compat": "2.0.1",

test/create-hash.js

@@ -4,35 +4,38 @@ var test = require('tape')
 var algorithms = ['sha1', 'sha224', 'sha256', 'sha384', 'sha512', 'md5', 'rmd160']
 var encodings = [/*'binary',*/ 'hex', 'base64'];
 var vectors = require('hash-test-vectors')
+testLib('createHash in crypto-browserify',require('../').createHash);
+testLib('create-hash/browser',require('create-hash/browser'));
+function testLib(name, createHash) {
+  test(name, function (t){
+    algorithms.forEach(function (algorithm) {
+      t.test('test ' + algorithm + ' against test vectors', function (t) {
+        vectors.forEach(function (obj, i) {
+          var input = new Buffer(obj.input, 'base64')
+          var node = obj[algorithm]
+          var js = createHash(algorithm).update(input).digest('hex')
+          t.equal(js, node, algorithm + '(testVector['+i+']) == ' + node)
+        })
 
-var createHash = require('../').createHash
-
-algorithms.forEach(function (algorithm) {
-  test('test ' + algorithm + ' against test vectors', function (t) {
-    vectors.forEach(function (obj, i) {
-      var input = new Buffer(obj.input, 'base64')
-      var node = obj[algorithm]
-      var js = createHash(algorithm).update(input).digest('hex')
-      t.equal(js, node, algorithm + '(testVector['+i+']) == ' + node)
-    })
-
-    encodings.forEach(function (encoding) {
+        encodings.forEach(function (encoding) {
+            vectors.forEach(function (obj, i) {
+              var input = new Buffer(obj.input, 'base64').toString(encoding)
+              var node = obj[algorithm]
+              var js = createHash(algorithm).update(input, encoding).digest('hex')
+              t.equal(js, node, algorithm + '(testVector['+i+'], '+encoding+') == ' + node)
+            })
+        });
         vectors.forEach(function (obj, i) {
-          var input = new Buffer(obj.input, 'base64').toString(encoding)
+          var input = new Buffer(obj.input, 'base64')
           var node = obj[algorithm]
-          var js = createHash(algorithm).update(input, encoding).digest('hex')
-          t.equal(js, node, algorithm + '(testVector['+i+'], '+encoding+') == ' + node)
+          var hash = createHash(algorithm);
+          hash.end(input)
+          var js = hash.read().toString('hex')
+          t.equal(js, node, algorithm + '(testVector['+i+']) == ' + node)
         })
+        t.end()
+      })
     });
-    vectors.forEach(function (obj, i) {
-      var input = new Buffer(obj.input, 'base64')
-      var node = obj[algorithm]
-      var hash = createHash(algorithm);
-      hash.end(input)
-      var js = hash.read().toString('hex')
-      t.equal(js, node, algorithm + '(testVector['+i+']) == ' + node)
-    })
-    t.end()
-  })
-});
 
+  });
+}

test/create-hmac.js

@@ -3,35 +3,37 @@ var test = require('tape')
 
 var algorithms = ['sha1', 'sha224', 'sha256', 'sha384', 'sha512', 'md5', 'rmd160']
 var vectors = require('hash-test-vectors/hmac')
-var createHmac = require('../').createHmac
+testLib('createHmac in crypto-browserify',require('../').createHmac);
+testLib('create-hmac/browser',require('create-hmac/browser'));
+function testLib(name, createHmac) {
+  test(name, function (t){
+    algorithms.forEach(function (alg) {
+
+      t.test('hmac('+alg+')', function (t) {
+        vectors.forEach(function (input, i) {
+          var output = createHmac(alg, new Buffer(input.key, 'hex'))
+              .update(input.data, 'hex').digest()
+
+          output = input.truncate ? output.slice(0, input.truncate) : output
+          t.equal(output.toString('hex'), input[alg])
+        })
+        t.end()
+      })
+
+      t.test('hmac('+alg+')', function (t) {
+        vectors.forEach(function (input, i) {
+          var hmac = createHmac(alg, new Buffer(input.key, 'hex'))
+
+          hmac.end(input.data, 'hex')
+          var output = hmac.read()
+
+          output = input.truncate ? output.slice(0, input.truncate) : output
+          t.equal(output.toString('hex'), input[alg])
+        })
+        t.end()
+      })
 
-algorithms.forEach(function (alg) {
-
-  test('hmac('+alg+')', function (t) {
-    vectors.forEach(function (input, i) {
-      var output = createHmac(alg, new Buffer(input.key, 'hex'))
-          .update(input.data, 'hex').digest()
-
-      output = input.truncate ? output.slice(0, input.truncate) : output
-      t.equal(output.toString('hex'), input[alg])
-    })
-    t.end()
-  })
-
-  test('hmac('+alg+')', function (t) {
-    vectors.forEach(function (input, i) {
-      var hmac = createHmac(alg, new Buffer(input.key, 'hex'))
-
-      hmac.end(input.data, 'hex')
-      var output = hmac.read()
-
-      output = input.truncate ? output.slice(0, input.truncate) : output
-      t.equal(output.toString('hex'), input[alg])
     })
-    t.end()
   })
 
-})
-
-
-
+}