fix: use sha512 for Ed25519 and shake256 for Ed448 ID Token _hash claims

panva · Nov 7, 2019 · fd3c9e9 · fd3c9e9
1 parent f34526c
commit fd3c9e9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/lib/models/id_token.js b/lib/models/id_token.js
@@ -139,14 +139,6 @@ module.exports = function getIdToken(provider) {
           throw new TypeError('invalid use option');
       }
 
-      if (alg && alg !== 'none') {
-        hashes.forEach((claim) => {
-          if (payload[claim]) {
-            payload[claim] = tokenHash(payload[claim], alg);
-          }
-        });
-      }
-
       const signed = await (() => {
         if (!alg) {
           return JSON.stringify(payload);
@@ -164,6 +156,14 @@ module.exports = function getIdToken(provider) {
 
         const key = keystore && keystore.get({ alg, use: 'sig' });
 
+        if (alg !== 'none') {
+          hashes.forEach((claim) => {
+            if (payload[claim]) {
+              payload[claim] = tokenHash(payload[claim], alg, key.crv);
+            }
+          });
+        }
+
         return JWT.sign(payload, key, alg, signOptions);
       })();
 

diff --git a/package.json b/package.json
@@ -57,7 +57,7 @@
     "lru-cache": "^5.1.1",
     "nanoid": "^2.1.6",
     "object-hash": "^2.0.0",
-    "oidc-token-hash": "^3.0.2",
+    "oidc-token-hash": "^4.0.0",
     "raw-body": "^2.4.1"
   },
   "devDependencies": {