Merge pull request #12 from volition-inc/restore-deprecated-concat-kdf-alg

Update: Support deprecated A*CBC+HS* algorithms (aka the "plus" algorithms)

Author: linuxwolf

lib/algorithms/aes-cbc-hmac-sha2.js

@@ -25,6 +25,9 @@ module.exports = {
     "A128CBC-HS256": 256,
     "A192CBC-HS384": 384,
     "A256CBC-HS512": 512,
+    "A128CBC+HS256": 256,
+    "A192CBC+HS384": 384,
+    "A256CBC+HS512": 512,
     "A128GCM": 128,
     "A192GCM": 192,
     "A256GCM": 256,
@@ -39,6 +42,9 @@ module.exports = {
     "A128CBC-HS256": 128,
     "A192CBC-HS384": 128,
     "A256CBC-HS512": 128,
+    "A128CBC+HS256": 128,
+    "A192CBC+HS384": 128,
+    "A256CBC+HS512": 128,
     "A128GCM": 96,
     "A192GCM": 96,
     "A256GCM": 96

lib/algorithms/constants.js

@@ -89,7 +89,8 @@ function JWEDecrypter(ks) {
 
       // decrypt with first key found
       var algKey,
-        encKey;
+        encKey,
+        kdata;
       promise = promise.then(function(rcptList) {
         var jwe = {};
         return new Promise(function(resolve, reject) {
@@ -100,10 +101,9 @@ function JWEDecrypter(ks) {
               return;
             }
 
-            var algPromise,
-              prekey;
+            var algPromise;
 
-            prekey = rcpt.encrypted_key || "";
+            var prekey = kdata = rcpt.encrypted_key || "";
             prekey = base64url.decode(prekey);
             algKey = assumedKey || keystore.get({
               use: "enc",
@@ -145,10 +145,14 @@ function JWEDecrypter(ks) {
         if ("aad" in input && null != input.aad) {
           adata += "." + input.aad;
         }
+
         var params = {
           iv: jwe.iv,
           adata: adata,
-          tag: jwe.tag
+          tag: jwe.tag,
+          kdata: kdata,
+          epu: jwe.epu,
+          epv: jwe.epv
         };
         var cdata = jwe.ciphertext;
 

lib/jwe/decrypt.js

@@ -379,6 +379,18 @@ function JWEEncrypter(cfg, fields, recipients) {
         }
         props.iv = iv;
 
+        if ("recipients" in jwe && jwe.recipients.length === 1) {
+          props.kdata = jwe.recipients[0].encrypted_key;
+        }
+
+        if ("epu" in cfg && cfg.epu != null) {
+          props.epu = cfg.epu;
+        }
+
+        if ("epv" in cfg && cfg.epv != null) {
+          props.epv = cfg.epv;
+        }
+
         var pdata = jwe.plaintext;
         delete jwe.plaintext;
         return encKey.then(function(encKey) {

lib/jwe/encrypt.js

@@ -23,7 +23,10 @@ var ENC_ALGS = [
   "A256GCM",
   "A128CBC-HS256",
   "A192CBC-HS384",
-  "A256CBC-HS512"
+  "A256CBC-HS512",
+  "A128CBC+HS256",
+  "A192CBC+HS384",
+  "A256CBC+HS512"
 ];
 var WRAP_ALGS = [
   "A128KW",
@@ -115,6 +118,7 @@ var JWKOctetCfg = {
       case "decrypt":
         return ENC_ALGS.filter(function(a) {
           return (a === ("A" + (len / 2) + "CBC-HS" + len)) ||
+                 (a === ("A" + (len / 2) + "CBC+HS" + len)) ||
                  (a === ("A" + len + "GCM"));
         });
       case "sign":

lib/jwk/octkey.js

@@ -523,9 +523,9 @@ describe("jwk/oct", function() {
       assert.deepEqual(algs, ["HS256"]);
 
       algs = JWK.OCTET.config.algorithms(keys, "encrypt");
-      assert.deepEqual(algs, ["A256GCM", "A128CBC-HS256"]);
+      assert.deepEqual(algs, ["A256GCM", "A128CBC-HS256", "A128CBC+HS256"]);
       algs = JWK.OCTET.config.algorithms(keys, "decrypt");
-      assert.deepEqual(algs, ["A256GCM", "A128CBC-HS256"]);
+      assert.deepEqual(algs, ["A256GCM", "A128CBC-HS256", "A128CBC+HS256"]);
 
       algs = JWK.OCTET.config.algorithms(keys, "wrap");
       assert.deepEqual(algs, ["A256KW", "A256GCMKW", "PBES2-HS256+A128KW", "PBES2-HS384+A192KW", "PBES2-HS512+A256KW", "dir"]);
@@ -542,9 +542,9 @@ describe("jwk/oct", function() {
       assert.deepEqual(algs, ["HS256", "HS384"]);
 
       algs = JWK.OCTET.config.algorithms(keys, "encrypt");
-      assert.deepEqual(algs, ["A192CBC-HS384"]);
+      assert.deepEqual(algs, ["A192CBC-HS384", "A192CBC+HS384"]);
       algs = JWK.OCTET.config.algorithms(keys, "decrypt");
-      assert.deepEqual(algs, ["A192CBC-HS384"]);
+      assert.deepEqual(algs, ["A192CBC-HS384", "A192CBC+HS384"]);
 
       algs = JWK.OCTET.config.algorithms(keys, "wrap");
       assert.deepEqual(algs, ["PBES2-HS256+A128KW", "PBES2-HS384+A192KW", "PBES2-HS512+A256KW", "dir"]);
@@ -561,9 +561,9 @@ describe("jwk/oct", function() {
       assert.deepEqual(algs, ["HS256", "HS384", "HS512"]);
 
       algs = JWK.OCTET.config.algorithms(keys, "encrypt");
-      assert.deepEqual(algs, ["A256CBC-HS512"]);
+      assert.deepEqual(algs, ["A256CBC-HS512", "A256CBC+HS512"]);
       algs = JWK.OCTET.config.algorithms(keys, "decrypt");
-      assert.deepEqual(algs, ["A256CBC-HS512"]);
+      assert.deepEqual(algs, ["A256CBC-HS512", "A256CBC+HS512"]);
 
       algs = JWK.OCTET.config.algorithms(keys, "wrap");
       assert.deepEqual(algs, ["PBES2-HS256+A128KW", "PBES2-HS384+A192KW", "PBES2-HS512+A256KW", "dir"]);

test/jwk/octkey-test.js

@@ -7,7 +7,7 @@
 var chai = require("chai");
 var assert = chai.assert;
 
-var cloneDeep = require("lodash.cloneDeep");
+var cloneDeep = require("lodash.clonedeep");
 var parseCompact = require("../../lib/parse/compact");
 var jose = {
   JWK: require("../../lib/jwk")

test/parse/compact-test.js

@@ -7,7 +7,7 @@
 var chai = require("chai");
 var assert = chai.assert;
 
-var cloneDeep = require("lodash.cloneDeep");
+var cloneDeep = require("lodash.clonedeep");
 var merge = require("../../lib/util/merge");
 
 var jose = {

test/parse/index-test.js

@@ -7,7 +7,7 @@
 var chai = require("chai");
 var assert = chai.assert;
 
-var cloneDeep = require("lodash.cloneDeep");
+var cloneDeep = require("lodash.clonedeep");
 var merge = require("../../lib/util/merge");
 var parseJSON = require("../../lib/parse/json");