fix: RSA fixes for suite

Sphereon-Opensource · Jan 14, 2023 · 834642a · 834642a
1 parent 3df79ab
commit 834642a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/packages/vc-handler-ld-local/src/suites/JsonWebSignature2020.ts b/packages/vc-handler-ld-local/src/suites/JsonWebSignature2020.ts
@@ -89,7 +89,7 @@ export class SphereonJsonWebSignature2020 extends SphereonLdSignature {
   getSuiteForVerification(): any {
     const verifier = {
       // returns a JWS detached
-      verify: async (args: { data: Uint8Array }): Promise<boolean> => {
+      verify: async (args: { data: Uint8Array; signature: Uint8Array }): Promise<boolean> => {
         return true
       },
     }

diff --git a/packages/vc-handler-ld-local/src/suites/impl/JsonWebKeyWithRSASupport.ts b/packages/vc-handler-ld-local/src/suites/impl/JsonWebKeyWithRSASupport.ts
@@ -123,7 +123,7 @@ const applyJwa = async (k: any, options?: any) => {
   const verifier = options?.verifier !== undefined ? options.verifier : await getVerifier(k, options)
   k.verifier = () => verifier as any
   if (k.privateKey || options?.signer !== undefined) {
-    const signer = options?.signer ? options.signer : await getSigner(k, options)
+    const signer = options?.signer !== undefined ? options.signer : await getSigner(k, options)
     k.signer = () => signer as any
   }
   return k

diff --git a/packages/vc-handler-ld-local/src/suites/impl/JsonWebSignatureWithRSASupport.ts b/packages/vc-handler-ld-local/src/suites/impl/JsonWebSignatureWithRSASupport.ts
@@ -230,6 +230,10 @@ export class JsonWebSignature {
   }
 
   async verifySignature({ verifyData, verificationMethod, proof }: any) {
+    if (verificationMethod.publicKeyJwk) {
+      const key = verificationMethod.publicKeyJwk as CryptoKey
+      return await crypto.subtle.verify(key.algorithm?.name ? key.algorithm.name : 'SHA-256', key, new Uint8Array(proof.jws), verifyData)
+    }
     const verifier = await verificationMethod.verifier()
     return verifier.verify({ data: verifyData, signature: proof.jws })
   }