Store key backup key in cache as Uint8Array

Bootstrap was incorrectly storing the key backup key as base64 encoded, when instead it should be a uint8Array. Fixes element-hq/element-web#13057
matrix-org · Apr 7, 2020 · 0efac7e · 0efac7e
1 parent dc56f05
commit 0efac7e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/src/crypto/index.js b/src/crypto/index.js
@@ -711,7 +711,8 @@ Crypto.prototype.bootstrapSecretStorage = async function({
         const sessionBackupKey = await this.getSecret('m.megolm_backup.v1');
         if (sessionBackupKey) {
             logger.info("Got session backup key from secret storage: caching");
-            await this.storeSessionBackupPrivateKey(sessionBackupKey);
+            const decoded = olmlib.decodeBase64(sessionBackupKey);
+            await this.storeSessionBackupPrivateKey(decoded);
         }
     } finally {
         // Restore the original callbacks. NB. we must do this by manipulating

diff --git a/src/crypto/verification/Base.js b/src/crypto/verification/Base.js
@@ -221,8 +221,7 @@ export class VerificationBase extends EventEmitter {
                             `m.cross_signing.${type}`, [this.deviceId],
                         );
                         const result = await promise;
-                        const decoded = decodeBase64(result);
-                        return Uint8Array.from(decoded);
+                        return decodeBase64(result);
                     } },
                     original._cacheCallbacks,
                 );
@@ -252,9 +251,7 @@ export class VerificationBase extends EventEmitter {
                         logger.info("Got key backup key, decoding...");
                         const decodedKey = decodeBase64(base64Key);
                         logger.info("Decoded backup key, storing...");
-                        client._crypto.storeSessionBackupPrivateKey(
-                            Uint8Array.from(decodedKey),
-                        );
+                        client._crypto.storeSessionBackupPrivateKey(decodedKey);
                         logger.info("Backup key stored. Starting backup restore...");
                         const backupInfo = await client.getKeyBackupVersion();
                         // no need to await for this - just let it go in the bg