Merge pull request #1355 from matrix-org/jryans/rm-extra-key-backup-setup-rc

Remove redundant key backup setup path
This commit is contained in:
J. Ryan Stinnett
2020-04-29 09:46:17 +01:00
committed by GitHub
-8
View File
@@ -596,14 +596,6 @@ Crypto.prototype.bootstrapSecretStorage = async function({
if (oldKeyInfo && oldKeyInfo.algorithm === SECRET_STORAGE_ALGORITHM_V1_AES) {
await ensureCanCheckPassphrase(oldKeyId, oldKeyInfo);
}
if (setupNewKeyBackup) {
const info = await this._baseApis.prepareKeyBackupVersion(
null /* random key */,
{ secureSecretStorage: true },
);
await this._baseApis.createKeyBackupVersion(info);
}
} else if (!inStorage && keyBackupInfo) {
// we have an existing backup, but no SSSS