Merge pull request #114 from crypto-browserify/pull-out-aes

pull out aes

Author: dcousens

index.js

@@ -41,7 +41,23 @@ exports.getHashes = function () {
 var p = require('./pbkdf2')(exports)
 exports.pbkdf2 = p.pbkdf2
 exports.pbkdf2Sync = p.pbkdf2Sync
-require('browserify-aes/inject')(exports, module.exports);
+
+var aes = require('browserify-aes');
+[
+  'Cipher',
+  'createCipher',
+  'Cipheriv',
+  'createCipheriv',
+  'Decipher',
+  'createDecipher',
+  'Decipheriv',
+  'createDecipheriv',
+  'getCiphers',
+  'listCiphers'
+].forEach(function (key) {
+  exports[key] = aes[key];
+})
+
 require('browserify-sign/inject')(module.exports, exports);
 require('diffie-hellman/inject')(exports, module.exports);
 require('create-ecdh/inject')(module.exports, exports);

package.json

@@ -16,7 +16,7 @@
     "node": "*"
   },
   "dependencies": {
-    "browserify-aes": "0.8.1",
+    "browserify-aes": "^1.0.0",
     "browserify-sign": "2.8.0",
     "create-ecdh": "1.0.3",
     "create-hash": "^1.1.0",

test/aes.js

@@ -1,11 +1,12 @@
 var test = require('tape');
-var crypto = require('../');
+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 = crypto.randomBytes(562);
-      var password = crypto.randomBytes(20);
+      var data = randomBytes(562);
+      var password = randomBytes(20);
       var crypter = crypto.createCipher(cipher, password);
       var decrypter = crypto.createDecipher(cipher, password);
       var out = [];
@@ -22,4 +23,19 @@ test('ciphers', function (t) {
 test('getCiphers', function (t) {
   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');
 });