Fix incorrect signatures being produced for caps

earthstar-project · May 15, 2024 · 9c1d13c · 9c1d13c
1 parent b174dbe
commit 9c1d13c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/src/meadowcap/meadowcap.test.ts b/src/meadowcap/meadowcap.test.ts
@@ -1,6 +1,7 @@
 import { assert, assertEquals, assertRejects } from "$std/assert/mod.ts";
 import {
   ANY_SUBSPACE,
+  concat,
   encodeEntry,
   Entry,
   KeypairScheme,
@@ -82,7 +83,7 @@ const ecdsaScheme: KeypairScheme<ArrayBuffer, CryptoKey, ArrayBuffer> = {
   },
   signatures: {
     sign: (
-      _publicKey: ArrayBuffer,
+      publicKey: ArrayBuffer,
       secretKey: CryptoKey,
       bytestring: Uint8Array,
     ) => {
@@ -92,7 +93,7 @@ const ecdsaScheme: KeypairScheme<ArrayBuffer, CryptoKey, ArrayBuffer> = {
           hash: { name: "SHA-256" },
         },
         secretKey,
-        bytestring,
+        concat(new Uint8Array(publicKey), bytestring),
       );
     },
     verify: async (
@@ -118,7 +119,7 @@ const ecdsaScheme: KeypairScheme<ArrayBuffer, CryptoKey, ArrayBuffer> = {
         },
         publicKeyWeb,
         signature,
-        bytestring,
+        concat(new Uint8Array(publicKey), bytestring),
       );
     },
   },

diff --git a/src/meadowcap/meadowcap.ts b/src/meadowcap/meadowcap.ts
@@ -215,8 +215,10 @@ export class Meadowcap<
       user,
     );
 
+    const receiver = this.getCapReceiver(cap);
+
     const signature = await this.params.userScheme.signatures.sign(
-      user,
+      receiver,
       secret,
       handover,
     );
@@ -280,8 +282,10 @@ export class Meadowcap<
       user,
     );
 
+    const receiver = this.getCapReceiver(cap);
+
     const signature = await this.params.userScheme.signatures.sign(
-      user,
+      receiver,
       secret,
       handover,
     );