Merge pull request #8 from simonratner/node-4

Compatibility with node v4

Author: simonratner

.travis.yml

@@ -1,4 +1,5 @@
 language: node_js
 node_js:
+  - "4"
   - "6"
   - "8"

lib/encrypted-attr.js

@@ -2,7 +2,9 @@
 
 const alg = 'aes-256-gcm'
 const crypto = require('crypto')
-const { get, set } = require('lodash')
+const get = require('lodash').get
+const set = require('lodash').set
+const Buffer = require('safe-buffer').Buffer
 
 function EncryptedAttributes (attributes, options) {
   options = options || {}
@@ -24,9 +26,11 @@ function EncryptedAttributes (attributes, options) {
     // Recommended 96-bit nonce with AES-GCM.
     let iv = crypto.randomBytes(12)
     let aad = Buffer.from(
-      `aes-256-gcm$${options.verifyId ? obj.id.toString() : ''}$${options.keyId}`)
+      `${alg}$${options.verifyId ? obj.id.toString() : ''}$${options.keyId}`)
     let key = Buffer.from(options.keys[options.keyId], 'base64')
-    let gcm = crypto.createCipheriv('aes-256-gcm', key, iv).setAAD(aad)
+    let gcm = crypto.createCipheriv(alg, key, iv)
+    gcm.setAAD(aad)
+
     let result = gcm.update(val, 'utf8', 'base64') + gcm.final('base64')
 
     return aad.toString('base64') + '$' +
@@ -54,16 +58,26 @@ function EncryptedAttributes (attributes, options) {
     if (options.verifyId && !obj.id) {
       throw new Error('Cannot decrypt without \'id\' attribute')
     }
-    let [aad, iv, payload, tag] = val.split('$').map((x) => Buffer.from(x, 'base64'))
-    let [, id, keyId] = aad.toString().split('$')
+    let parts = val.split('$').map((x) => Buffer.from(x, 'base64'))
+    let aad = parts[0]
+    let iv = parts[1]
+    let payload = parts[2]
+    let tag = parts[3]
+
+    parts = aad.toString().split('$')
+    let id = parts[1]
+    let keyId = parts[2]
+
     if (options.verifyId && (id !== obj.id.toString())) {
       throw new Error('Encrypted attribute has invalid id')
     }
     if (!options.keys[keyId]) {
       throw new Error('Encrypted attribute has invalid key id')
     }
     let key = Buffer.from(options.keys[keyId], 'base64')
-    let gcm = crypto.createDecipheriv('aes-256-gcm', key, iv).setAAD(aad).setAuthTag(tag)
+    let gcm = crypto.createDecipheriv(alg, key, iv)
+    gcm.setAAD(aad)
+    gcm.setAuthTag(tag)
 
     return gcm.update(payload, 'binary', 'utf8') + gcm.final('utf8')
   }

package.json

@@ -4,7 +4,7 @@
   "description": "Encrypted model attributes in your favourite ORM.",
   "author": "Simon Ratner (https://github.com/simonratner)",
   "engines": {
-    "node": ">=6.0"
+    "node": ">=4.0"
   },
   "keywords": [
     "attr_encrypted",
@@ -15,17 +15,18 @@
     "orm"
   ],
   "dependencies": {
-    "lodash": "^4.17.4"
+    "lodash": "^4.17.4",
+    "safe-buffer": "^5.1.1"
   },
-  "optionalDependencies": {},
   "devDependencies": {
     "mocha": "^3.5.0",
     "mocha-standard": "^1.0.0",
     "standard": "^10.0.3",
     "unexpected": "^10.33.2"
   },
+  "optionalDependencies": {},
   "scripts": {
-    "test": "./node_modules/.bin/mocha -R spec --recursive"
+    "test": "mocha -R spec --recursive"
   },
   "homepage": "https://github.com/simonratner/node-encrypted-attr",
   "repository": {