From 26738d14f1d60d9aa7471d0be267d286a4644069 Mon Sep 17 00:00:00 2001
From: Florian Dold <florian@dold.me>
Date: Tue, 19 Oct 2021 18:39:38 +0200
Subject: anastasis-core: crypto fixes

---
 packages/anastasis-core/src/crypto.ts | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'packages/anastasis-core/src/crypto.ts')

diff --git a/packages/anastasis-core/src/crypto.ts b/packages/anastasis-core/src/crypto.ts
index 32cf470c4..1332f8492 100644
--- a/packages/anastasis-core/src/crypto.ts
+++ b/packages/anastasis-core/src/crypto.ts
@@ -66,16 +66,12 @@ export function accountKeypairDerive(userId: UserIdentifier): AccountKeyPair {
   // FIXME: the KDF invocation looks fishy, but that's what the C code presently does.
   const d = kdfKw({
     outputLength: 32,
-    ikm: stringToBytes("ver"),
-    salt: decodeCrock(userId),
+    ikm: decodeCrock(userId),
+    info: stringToBytes("ver"),
   });
-  // FIXME: This bit twiddling seems wrong/unnecessary.
-  d[0] &= 248;
-  d[31] &= 127;
-  d[31] |= 64;
   const pair = crypto_sign_keyPair_fromSeed(d);
   return {
-    priv: encodeCrock(pair.secretKey),
+    priv: encodeCrock(d),
     pub: encodeCrock(pair.publicKey),
   };
 }
-- 
cgit v1.2.3