update packages

4 files changed, 40 insertions, 45 deletions

diff --git a/node_modules/browserify-cipher/.travis.yml b/node_modules/browserify-cipher/.travis.yml
index eb83acd99..ad7554ba1 100644
--- a/node_modules/browserify-cipher/.travis.yml
+++ b/node_modules/browserify-cipher/.travis.yml
@@ -1,6 +1,14 @@
+sudo: false
 language: node_js
 node_js:
-  - "0.11"
-  - "0.10"
-  - "0.12"
-  - "iojs"
+  - "4"
+  - "5"
+  - "6"
+  - "7"
+matrix:
+  include:
+    - node_js: "7"
+      env: TEST_SUITE=standard
+env:
+  - TEST_SUITE=unit
+script: npm run-script $TEST_SUITE
diff --git a/node_modules/browserify-cipher/browser.js b/node_modules/browserify-cipher/browser.js
index e009f9311..444825b29 100644
--- a/node_modules/browserify-cipher/browser.js
+++ b/node_modules/browserify-cipher/browser.js
@@ -1,11 +1,13 @@
-var ebtk = require('evp_bytestokey')
-var aes = require('browserify-aes/browser')
 var DES = require('browserify-des')
-var desModes = require('browserify-des/modes')
+var aes = require('browserify-aes/browser')
 var aesModes = require('browserify-aes/modes')
+var desModes = require('browserify-des/modes')
+var ebtk = require('evp_bytestokey')
+
 function createCipher (suite, password) {
-  var keyLen, ivLen
   suite = suite.toLowerCase()
+
+  var keyLen, ivLen
   if (aesModes[suite]) {
     keyLen = aesModes[suite].key
     ivLen = aesModes[suite].iv
@@ -15,12 +17,15 @@ function createCipher (suite, password) {
   } else {
     throw new TypeError('invalid suite type')
   }
+
   var keys = ebtk(password, false, keyLen, ivLen)
   return createCipheriv(suite, keys.key, keys.iv)
 }
+
 function createDecipher (suite, password) {
-  var keyLen, ivLen
   suite = suite.toLowerCase()
+
+  var keyLen, ivLen
   if (aesModes[suite]) {
     keyLen = aesModes[suite].key
     ivLen = aesModes[suite].iv
@@ -30,44 +35,33 @@ function createDecipher (suite, password) {
   } else {
     throw new TypeError('invalid suite type')
   }
+
   var keys = ebtk(password, false, keyLen, ivLen)
   return createDecipheriv(suite, keys.key, keys.iv)
 }
 
 function createCipheriv (suite, key, iv) {
   suite = suite.toLowerCase()
-  if (aesModes[suite]) {
-    return aes.createCipheriv(suite, key, iv)
-  } else if (desModes[suite]) {
-    return new DES({
-      key: key,
-      iv: iv,
-      mode: suite
-    })
-  } else {
-    throw new TypeError('invalid suite type')
-  }
+  if (aesModes[suite]) return aes.createCipheriv(suite, key, iv)
+  if (desModes[suite]) return new DES({ key: key, iv: iv, mode: suite })
+
+  throw new TypeError('invalid suite type')
 }
+
 function createDecipheriv (suite, key, iv) {
   suite = suite.toLowerCase()
-  if (aesModes[suite]) {
-    return aes.createDecipheriv(suite, key, iv)
-  } else if (desModes[suite]) {
-    return new DES({
-      key: key,
-      iv: iv,
-      mode: suite,
-      decrypt: true
-    })
-  } else {
-    throw new TypeError('invalid suite type')
-  }
+  if (aesModes[suite]) return aes.createDecipheriv(suite, key, iv)
+  if (desModes[suite]) return new DES({ key: key, iv: iv, mode: suite, decrypt: true })
+
+  throw new TypeError('invalid suite type')
+}
+
+function getCiphers () {
+  return Object.keys(desModes).concat(aes.getCiphers())
 }
+
 exports.createCipher = exports.Cipher = createCipher
 exports.createCipheriv = exports.Cipheriv = createCipheriv
 exports.createDecipher = exports.Decipher = createDecipher
 exports.createDecipheriv = exports.Decipheriv = createDecipheriv
-function getCiphers () {
-  return Object.keys(desModes).concat(aes.getCiphers())
-}
 exports.listCiphers = exports.getCiphers = getCiphers
diff --git a/node_modules/browserify-cipher/package.json b/node_modules/browserify-cipher/package.json
index c0930d56d..7bdf2a6a0 100644
--- a/node_modules/browserify-cipher/package.json
+++ b/node_modules/browserify-cipher/package.json
@@ -1,6 +1,6 @@
 {
   "name": "browserify-cipher",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "ciphers for the browser",
   "main": "index.js",
   "dependencies": {
@@ -10,7 +10,7 @@
   },
   "browser": "browser.js",
   "devDependencies": {
-    "standard": "^5.3.1",
+    "standard": "^10.0.2",
     "tap-spec": "^4.1.0",
     "tape": "^4.2.0"
   },
@@ -23,4 +23,4 @@
     "type": "git",
     "url": "git@github.com:crypto-browserify/browserify-cipher.git"
   }
-}
\ No newline at end of file
+}
diff --git a/node_modules/browserify-cipher/readme.md b/node_modules/browserify-cipher/readme.md
deleted file mode 100644
index 3c0b1576e..000000000
--- a/node_modules/browserify-cipher/readme.md
+++ /dev/null
@@ -1,7 +0,0 @@
-browserify-cipher
-===
-
-[![Build Status](https://travis-ci.org/crypto-browserify/browserify-cipher.svg)](https://travis-ci.org/crypto-browserify/browserify-cipher)
-
-Provides createCipher, createDecipher, createCipheriv, createDecipheriv and
-getCiphers for the browserify.  Includes AES and DES ciphers.