Merge pull request #21 from eoger/master

Add backwards compatibility with Node 0.10

Author: martinthomson

nodejs/ece.js

@@ -2,6 +2,7 @@
 
 var crypto = require('crypto');
 var base64 = require('urlsafe-base64');
+require('./shim');
 
 var savedKeys = {};
 var keyLabels = {};
@@ -55,7 +56,8 @@ function HKDF(salt, ikm, info, len) {
 
 function info(base, context) {
   var result = Buffer.concat([
-    new Buffer('Content-Encoding: ' + base + '\0', 'ascii'),
+    new Buffer('Content-Encoding: ' + base, 'ascii'),
+    new Buffer('\0'),
     context
   ]);
   keylog('info ' + base, result);
@@ -304,7 +306,8 @@ function encrypt(buffer, params) {
 function saveKey(id, key, dhLabel) {
   savedKeys[id] = key;
   if (dhLabel) {
-    keyLabels[id] = new Buffer(dhLabel + '\0', 'ascii');
+    keyLabels[id] = Buffer.concat([new Buffer(dhLabel, 'ascii'),
+                                   new Buffer('\0')]);
   }
 }
 

nodejs/package.json

@@ -5,18 +5,27 @@
   "homepage": "https://github.com/martinthomson/encrypted-content-encoding",
   "bugs": "https://github.com/martinthomson/encrypted-content-encoding/issues",
   "author": {
-    "name" : "Martin Thomson",
-    "email" : "martin.thomson@gmail.com"
+    "name": "Martin Thomson",
+    "email": "martin.thomson@gmail.com"
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/martinthomson/encrypted-content-encoding.git"
   },
   "license": "MIT",
   "main": "./ece.js",
-  "scripts": { "test": "node ./test.js" },
-  "engines" : { "node" : ">=4.0.0" },
+  "scripts": {
+    "test": "node ./test.js"
+  },
+  "engines": {
+    "node": ">=0.10.0"
+  },
   "dependencies": {
+    "browserify-aes": "^1.0.6",
+    "buffer-compare-shim": "^1.0.0",
+    "buffer-io-shim": "^1.0.0",
+    "create-ecdh": "~4.0.0",
+    "semver": "~5.1.0",
     "urlsafe-base64": "~1.0.0"
   }
 }

nodejs/shim/index.js

@@ -0,0 +1,11 @@
+var semver = require('semver');
+if (semver.satisfies(process.version, '>= 0.12.0')) {
+  return;
+}
+
+require('buffer-compare-shim');
+require('buffer-io-shim');
+var crypto = require('crypto');
+crypto.createECDH = require('create-ecdh');
+crypto.createCipheriv = require('browserify-aes/encrypter').createCipheriv;
+crypto.createDecipheriv = require('browserify-aes/decrypter').createDecipheriv;