From e2b46a2b8a33ee62ce7a14fae4f4f41578765de9 Mon Sep 17 00:00:00 2001
From: Steven Vandevelde <icid.asset@gmail.com>
Date: Sun, 18 Jun 2023 17:34:20 +0200
Subject: [PATCH] Fix string encoding

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

diff --git a/src/Javascript/crypto.ts b/src/Javascript/crypto.ts
index 5801cf10..717f315e 100644
--- a/src/Javascript/crypto.ts
+++ b/src/Javascript/crypto.ts
@@ -12,9 +12,13 @@ const extractable = false
 
 
 export function keyFromPassphrase(passphrase) {
+  console.log(
+    Uint8arrays.fromString(passphrase, "base64pad")
+  )
+
   return crypto.subtle.importKey(
     "raw",
-    Uint8arrays.fromString(passphrase, "base64pad"),
+    Uint8arrays.fromString(passphrase, "utf8"),
     {
       name: "PBKDF2"
     },
@@ -24,7 +28,7 @@ export function keyFromPassphrase(passphrase) {
   ).then(baseKey => crypto.subtle.deriveKey(
     {
       name: "PBKDF2",
-      salt: Uint8arrays.fromString("diffuse", "base64pad"),
+      salt: Uint8arrays.fromString("diffuse", "utf8"),
       iterations: 10000,
       hash: "SHA-512"
     },
@@ -80,7 +84,7 @@ export function decrypt(key, string) {
   ).then(
     buffer => Uint8arrays.toString(
       new Uint8Array(buffer),
-      "base64pad"
+      "utf8"
     )
 
   )
-- 
2.51.2