Merge pull request #24 from nodeSolidServer/es256

allow ES384 and 512

Author: bourgeoa

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@solid/jose",
-  "version": "0.6.9",
+  "version": "0.7.0",
   "description": "JSON Object Signing and Encryption",
   "main": "src/index.js",
   "directories": {

package.json

@@ -64,8 +64,23 @@ supportedAlgorithms.define('ES256', 'sign', new ECDSA({
   },
   namedCurve: 'P-256'
 }))
-//supportedAlgorithms.define('ES384', 'sign', {})
-//supportedAlgorithms.define('ES512', 'sign', {})
+
+supportedAlgorithms.define('ES384', 'sign', new ECDSA({
+  name: 'ECDSA',
+  hash: {
+    name: 'SHA-384'
+  },
+  namedCurve: 'P-384'
+}))
+
+supportedAlgorithms.define('ES512', 'sign', new ECDSA({
+  name: 'ECDSA',
+  hash: {
+    name: 'SHA-512'
+  },
+  namedCurve: 'P-521'
+}))
+
 //supportedAlgorithms.define('PS256', 'sign', {})
 //supportedAlgorithms.define('PS384', 'sign', {})
 //supportedAlgorithms.define('PS512', 'sign', {})
@@ -126,8 +141,23 @@ supportedAlgorithms.define('ES256', 'verify', new ECDSA({
   },
   namedCurve: 'P-256'
 }))
-//supportedAlgorithms.define('ES384', 'verify', {})
-//supportedAlgorithms.define('ES512', 'verify', {})
+
+supportedAlgorithms.define('ES384', 'verify', new ECDSA({
+  name: 'ECDSA',
+  hash: {
+    name: 'SHA-384'
+  },
+  namedCurve: 'P-384'
+}))
+
+supportedAlgorithms.define('ES512', 'verify', new ECDSA({
+  name: 'ECDSA',
+  hash: {
+    name: 'SHA-512'
+  },
+  namedCurve: 'P-521'
+}))
+
 //supportedAlgorithms.define('PS256', 'verify', {})
 //supportedAlgorithms.define('PS384', 'verify', {})
 //supportedAlgorithms.define('PS512', 'verify', {})
@@ -165,6 +195,22 @@ supportedAlgorithms.define('ES256', 'importKey', new ECDSA({
   namedCurve: 'P-256'
 }))
 
+supportedAlgorithms.define('ES384', 'importKey', new ECDSA({
+  name: 'ECDSA',
+  hash: {
+    name: 'SHA-384'
+  },
+  namedCurve: 'P-384'
+}))
+
+supportedAlgorithms.define('ES512', 'importKey', new ECDSA({
+  name: 'ECDSA',
+  hash: {
+    name: 'SHA-512'
+  },
+  namedCurve: 'P-521'
+}))
+
 /**
  * Export
  */

src/algorithms/index.js

@@ -87,6 +87,11 @@ class JWA {
    */
   static async importKey (key) {
     let normalizedAlgorithm = supportedAlgorithms.normalize('importKey', key.alg)
+
+    if (normalizedAlgorithm instanceof Error) {
+      return Promise.reject(new NotSupportedError(key.alg))
+    }
+
     return normalizedAlgorithm.importKey(key)
   }
 }