Merge pull request #134 from crypto-browserify/standard

Adds Standard

Author: calvinmetcalf

.travis.yml

@@ -1,6 +1,11 @@
+sudo: false
 language: node_js
 node_js:
   - "0.10"
   - "0.11"
   - "0.12"
-  - "iojs"
+  - "iojs"
+env:
+  - TEST_SUITE=standard
+  - TEST_SUITE=unit
+script: "npm run-script $TEST_SUITE"

readme.markdown renamed to README.md

@@ -3,6 +3,7 @@
 A port of node's `crypto` module to the browser.
 
 [![travis](https://img.shields.io/travis/crypto-browserify/crypto-browserify/master.svg?style=flat)](https://travis-ci.org/crypto-browserify/crypto-browserify)
+[![js-standard-style](https://cdn.rawgit.com/feross/standard/master/badge.svg)](https://github.com/feross/standard)
 
 The goal of this module is to reimplement node's crypto module,
 in pure javascript so that it can run in the browser.

example/test.js

@@ -1,4 +1,4 @@
 var crypto = require('crypto')
 var abc = crypto.createHash('sha1').update('abc').digest('hex')
 console.log(abc)
-//require('hello').inlineCall().call2()
+// require('hello').inlineCall().call2()

index.js

@@ -1,22 +1,20 @@
-'use strict';
+'use strict'
 
 exports.randomBytes = exports.rng = exports.pseudoRandomBytes = exports.prng = require('randombytes')
-
 exports.createHash = exports.Hash = require('create-hash')
-
 exports.createHmac = exports.Hmac = require('create-hmac')
 
 var hashes = ['sha1', 'sha224', 'sha256', 'sha384', 'sha512', 'md5', 'rmd160'].concat(Object.keys(require('browserify-sign/algos')))
 exports.getHashes = function () {
-  return hashes;
+  return hashes
 }
 
 var p = require('pbkdf2')
 exports.pbkdf2 = p.pbkdf2
 exports.pbkdf2Sync = p.pbkdf2Sync
 
-var aes = require('browserify-aes');
-[
+var aes = require('browserify-aes')
+;[
   'Cipher',
   'createCipher',
   'Cipheriv',
@@ -28,41 +26,41 @@ var aes = require('browserify-aes');
   'getCiphers',
   'listCiphers'
 ].forEach(function (key) {
-  exports[key] = aes[key];
+  exports[key] = aes[key]
 })
 
-var dh = require('diffie-hellman');
-[
+var dh = require('diffie-hellman')
+;[
   'DiffieHellmanGroup',
   'createDiffieHellmanGroup',
   'getDiffieHellman',
   'createDiffieHellman',
   'DiffieHellman'
 ].forEach(function (key) {
-  exports[key] = dh[key];
+  exports[key] = dh[key]
 })
 
-var sign = require('browserify-sign');
-[
+var sign = require('browserify-sign')
+;[
   'createSign',
   'Sign',
   'createVerify',
   'Verify'
 ].forEach(function (key) {
-  exports[key] = sign[key];
+  exports[key] = sign[key]
 })
 
 exports.createECDH = require('create-ecdh')
 
-var publicEncrypt = require('public-encrypt');
+var publicEncrypt = require('public-encrypt')
 
-[
+;[
   'publicEncrypt',
   'privateEncrypt',
   'publicDecrypt',
   'privateDecrypt'
 ].forEach(function (key) {
-  exports[key] = publicEncrypt[key];
+  exports[key] = publicEncrypt[key]
 })
 
 // the least I can do is make error messages for the rest of the node.js/crypto api.
@@ -74,6 +72,6 @@ var publicEncrypt = require('public-encrypt');
       'sorry, ' + name + ' is not implemented yet',
       'we accept pull requests',
       'https://github.com/crypto-browserify/crypto-browserify'
-    ].join('\n'));
+    ].join('\n'))
   }
 })

package.json

@@ -9,8 +9,10 @@
     "url": "git://github.com/crypto-browserify/crypto-browserify.git"
   },
   "scripts": {
-    "test": "set -e; for t in test/node/*.js test/*.js; do node $t; done",
-    "prepublish": "npm ls && npm test"
+    "prepublish": "npm ls && npm test",
+    "standard": "standard",
+    "test": "npm run standard && npm run unit",
+    "unit": "set -e; for t in test/node/*.js test/*.js; do node $t; done"
   },
   "engines": {
     "node": "*"
@@ -28,8 +30,9 @@
     "randombytes": "^2.0.0"
   },
   "devDependencies": {
-    "tape": "~2.3.2",
-    "hash-test-vectors": "~1.3.2"
+    "hash-test-vectors": "~1.3.2",
+    "standard": "^5.0.2",
+    "tape": "~2.3.2"
   },
   "optionalDependencies": {},
   "browser": {

test/aes.js

@@ -1,41 +1,44 @@
-var test = require('tape');
-var crypto = require('browserify-aes/browser');
-var randomBytes = require('randombytes');
+var test = require('tape')
+var crypto = require('browserify-aes/browser')
+var randomBytes = require('randombytes')
+
 test('ciphers', function (t) {
   crypto.listCiphers().forEach(function (cipher) {
     t.test(cipher, function (t) {
-      t.plan(1);
-      var data = randomBytes(562);
-      var password = randomBytes(20);
-      var crypter = crypto.createCipher(cipher, password);
-      var decrypter = crypto.createDecipher(cipher, password);
-      var out = [];
-      out.push(decrypter.update(crypter.update(data)));
-      out.push(decrypter.update(crypter.final()));
+      t.plan(1)
+      var data = randomBytes(562)
+      var password = randomBytes(20)
+      var crypter = crypto.createCipher(cipher, password)
+      var decrypter = crypto.createDecipher(cipher, password)
+      var out = []
+      out.push(decrypter.update(crypter.update(data)))
+      out.push(decrypter.update(crypter.final()))
       if (cipher.indexOf('gcm') > -1) {
-        decrypter.setAuthTag(crypter.getAuthTag());
+        decrypter.setAuthTag(crypter.getAuthTag())
       }
-      out.push(decrypter.final());
-      t.equals(data.toString('hex'), Buffer.concat(out).toString('hex'));
-    });
-  });
-});
+      out.push(decrypter.final())
+      t.equals(data.toString('hex'), Buffer.concat(out).toString('hex'))
+    })
+  })
+})
+
 test('getCiphers', function (t) {
-  t.plan(1);
-  t.ok(crypto.getCiphers().length, 'get ciphers returns an array');
-});
+  t.plan(1)
+  t.ok(crypto.getCiphers().length, 'get ciphers returns an array')
+})
+
 test('through crypto browserify works', function (t) {
-  t.plan(2);
-  var crypto = require('../');
-  var cipher = 'aes-128-ctr';
-  var data = randomBytes(562);
-  var password = randomBytes(20);
-  var crypter = crypto.createCipher(cipher, password);
-  var decrypter = crypto.createDecipher(cipher, password);
-  var out = [];
-  out.push(decrypter.update(crypter.update(data)));
-  out.push(decrypter.update(crypter.final()));
-  out.push(decrypter.final());
-  t.equals(data.toString('hex'), Buffer.concat(out).toString('hex'));
-  t.ok(crypto.getCiphers().length, 'get ciphers returns an array');
-});
+  t.plan(2)
+  var crypto = require('../')
+  var cipher = 'aes-128-ctr'
+  var data = randomBytes(562)
+  var password = randomBytes(20)
+  var crypter = crypto.createCipher(cipher, password)
+  var decrypter = crypto.createDecipher(cipher, password)
+  var out = []
+  out.push(decrypter.update(crypter.update(data)))
+  out.push(decrypter.update(crypter.final()))
+  out.push(decrypter.final())
+  t.equals(data.toString('hex'), Buffer.concat(out).toString('hex'))
+  t.ok(crypto.getCiphers().length, 'get ciphers returns an array')
+})

test/create-hash.js

@@ -1,41 +1,42 @@
-var fs = require('fs')
 var test = require('tape')
 
 var algorithms = ['sha1', 'sha224', 'sha256', 'sha384', 'sha512', 'md5', 'rmd160']
-var encodings = [/*'binary',*/ 'hex', 'base64'];
+var encodings = ['hex', 'base64'] // FIXME: test binary
 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){
+
+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)
+          t.equal(js, node, algorithm + '(testVector[' + i + ']) == ' + node)
         })
 
         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 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')
           var node = obj[algorithm]
-          var hash = createHash(algorithm);
+          var hash = createHash(algorithm)
           hash.end(input)
           var js = hash.read().toString('hex')
-          t.equal(js, node, algorithm + '(testVector['+i+']) == ' + node)
+          t.equal(js, node, algorithm + '(testVector[' + i + ']) == ' + node)
         })
         t.end()
       })
-    });
+    })
 
-  });
-}
+  })
+}

test/create-hmac.js

@@ -1,26 +1,25 @@
-
 var test = require('tape')
 
 var algorithms = ['sha1', 'sha224', 'sha256', 'sha384', 'sha512', 'md5', 'rmd160']
 var vectors = require('hash-test-vectors/hmac')
-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) {
+testLib('createHmac in crypto-browserify', require('../').createHmac)
+testLib('create-hmac/browser', require('create-hmac/browser'))
 
-      t.test('hmac('+alg+')', function (t) {
+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()
+            .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) {
+      t.test('hmac(' + alg + ')', function (t) {
         vectors.forEach(function (input, i) {
           var hmac = createHmac(alg, new Buffer(input.key, 'hex'))
 
@@ -35,5 +34,4 @@ function testLib(name, createHmac) {
 
     })
   })
-
 }