Merge pull request #56 from joseluisdiaz/fix-async-dep

Remove async as a dep.

Author: esarafianou

Diff for: .travis.yml

@@ -1,6 +1,7 @@
 language: node_js
 node_js:
-  - 0.10
   - 4
   - 6
   - 8
+  - 10
+  - 12

Diff for: lib/xmlenc.js

@@ -1,5 +1,4 @@
 var crypto  = require('crypto');
-var async   = require('async');
 var xmldom  = require('xmldom');
 var xpath   = require('xpath');
 var utils   = require('./utils');
@@ -59,60 +58,83 @@ function encrypt(content, options, callback) {
 
   options.input_encoding = options.input_encoding || 'utf8';
 
-  async.waterfall([
-    function generate_symmetric_key(cb) {
-      switch (options.encryptionAlgorithm) {
-        case 'http://www.w3.org/2001/04/xmlenc#aes128-cbc':
-          crypto.randomBytes(16, cb); // generate a symmetric random key 16 bytes length
-          break;
-        case 'http://www.w3.org/2001/04/xmlenc#aes256-cbc':
-          crypto.randomBytes(32, cb); // generate a symmetric random key 32 bytes length
-          break;
-        case 'http://www.w3.org/2001/04/xmlenc#tripledes-cbc':
-          crypto.randomBytes(24, cb); // generate a symmetric random key 24 bytes (192 bits) length
-          break;
-        default:
-          crypto.randomBytes(32, cb); // generate a symmetric random key 32 bytes length
-      }
-    },
-    function encrypt_content(symmetricKey, cb) {
-      switch (options.encryptionAlgorithm) {
-        case 'http://www.w3.org/2001/04/xmlenc#aes128-cbc':
-          encryptWithAlgorithm('aes-128-cbc', symmetricKey, 16, content, options.input_encoding, function (err, encryptedContent) {
-            if (err) return cb(err);
-            cb(null, symmetricKey, encryptedContent);
-          });
-          break;
-        case 'http://www.w3.org/2001/04/xmlenc#aes256-cbc':
-          encryptWithAlgorithm('aes-256-cbc', symmetricKey, 16, content, options.input_encoding, function (err, encryptedContent) {
-            if (err) return cb(err);
-            cb(null, symmetricKey, encryptedContent);
-          });
-          break;
-        case 'http://www.w3.org/2001/04/xmlenc#tripledes-cbc':
-          encryptWithAlgorithm('des-ede3-cbc', symmetricKey, 8, content, options.input_encoding, function (err, encryptedContent) {
-            if (err) return cb(err);
-            cb(null, symmetricKey, encryptedContent);
-          });
-          break;
-        default:
-          cb(new Error('encryption algorithm not supported'));
-      }
-    },
-    function encrypt_key(symmetricKey, encryptedContent, cb) {
-      encryptKeyInfo(symmetricKey, options, function(err, keyInfo) {
-        if (err) return cb(err);
-
-        var result = utils.renderTemplate('encrypted-key', {
-          encryptedContent: encryptedContent.toString('base64'),
-          keyInfo: keyInfo,
-          contentEncryptionMethod: options.encryptionAlgorithm
+  function generate_symmetric_key(cb) {
+    switch (options.encryptionAlgorithm) {
+      case 'http://www.w3.org/2001/04/xmlenc#aes128-cbc':
+        crypto.randomBytes(16, cb); // generate a symmetric random key 16 bytes length
+        break;
+      case 'http://www.w3.org/2001/04/xmlenc#aes256-cbc':
+        crypto.randomBytes(32, cb); // generate a symmetric random key 32 bytes length
+        break;
+      case 'http://www.w3.org/2001/04/xmlenc#tripledes-cbc':
+        crypto.randomBytes(24, cb); // generate a symmetric random key 24 bytes (192 bits) length
+        break;
+      default:
+        crypto.randomBytes(32, cb); // generate a symmetric random key 32 bytes length
+    }
+  }
+
+  function encrypt_content(symmetricKey, cb) {
+    switch (options.encryptionAlgorithm) {
+      case 'http://www.w3.org/2001/04/xmlenc#aes128-cbc':
+        encryptWithAlgorithm('aes-128-cbc', symmetricKey, 16, content, options.input_encoding, function (err, encryptedContent) {
+          if (err) return cb(err);
+          cb(null, encryptedContent);
+        });
+        break;
+      case 'http://www.w3.org/2001/04/xmlenc#aes256-cbc':
+        encryptWithAlgorithm('aes-256-cbc', symmetricKey, 16, content, options.input_encoding, function (err, encryptedContent) {
+          if (err) return cb(err);
+          cb(null, encryptedContent);
         });
+        break;
+      case 'http://www.w3.org/2001/04/xmlenc#tripledes-cbc':
+        encryptWithAlgorithm('des-ede3-cbc', symmetricKey, 8, content, options.input_encoding, function (err, encryptedContent) {
+          if (err) return cb(err);
+          cb(null, encryptedContent);
+        });
+        break;
+      default:
+        cb(new Error('encryption algorithm not supported'));
+    }
+  }
 
-        cb(null, result);
+  function encrypt_key(symmetricKey, encryptedContent, cb) {
+    encryptKeyInfo(symmetricKey, options, function(err, keyInfo) {
+      if (err) return cb(err);
+
+      var result = utils.renderTemplate('encrypted-key', {
+        encryptedContent: encryptedContent.toString('base64'),
+        keyInfo: keyInfo,
+        contentEncryptionMethod: options.encryptionAlgorithm
       });
+
+      cb(null, result);
+    });
+  }
+
+
+  generate_symmetric_key(function (genKeyError, symmetricKey) {
+    if (genKeyError) {
+      return callback(genKeyError);
     }
-  ], callback);
+
+    encrypt_content(symmetricKey, function(encryptContentError, encryptedContent) {
+      if (encryptContentError) {
+        return callback(encryptContentError);
+      }
+
+      encrypt_key(symmetricKey, encryptedContent, function (encryptKeyError, result) {
+        if (encryptKeyError) {
+          return callback(encryptKeyError);
+        }
+
+        callback(null, result);
+      });
+
+    });
+
+  });
 }
 
 function decrypt(xml, options, callback) {

Diff for: package.json

@@ -1,6 +1,6 @@
 {
   "name": "xml-encryption",
-  "version": "0.11.2",
+  "version": "0.12.0",
   "devDependencies": {
     "mocha": "3.3.0",
     "should": "^11.2.1"
@@ -19,7 +19,6 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "async": "^2.1.5",
     "ejs": "^2.5.6",
     "node-forge": "^0.7.0",
     "xmldom": "~0.1.15",
@@ -29,6 +28,6 @@
     "test": "mocha"
   },
   "engines": {
-    "node": ">=0.10"
+    "node": ">=4"
   }
 }