Merge pull request #15 from volition-inc/use-assumed-key-when-provided

Fix: When an assumed key is provided, use it over any others (fixes #14)

Author: linuxwolf

lib/jwe/decrypt.js

@@ -105,7 +105,7 @@ function JWEDecrypter(ks) {
 
             prekey = rcpt.encrypted_key || "";
             prekey = base64url.decode(prekey);
-            algKey = keystore.get({
+            algKey = assumedKey || keystore.get({
               use: "enc",
               alg: rcpt.header.alg,
               kid: rcpt.header.kid

lib/jws/verify.js

@@ -89,7 +89,7 @@ var JWSVerifier = function(ks) {
           var content = new Buffer((sig.protected || "") + "." + input.payload, "ascii");
 
           var algPromise,
-              algKey = keystore.get({
+              algKey = assumedKey || keystore.get({
             use: "sig",
             alg: sig.header.alg,
             kid: sig.header.kid