From 20bc8071fc75929f7d62614183db75d0927603ac Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 3 Jan 2020 13:52:36 +0000 Subject: [PATCH] Fix creating a key backup with cross signing diabled It broke if no scret key callback was supplied but a cross-signing identity did exist (as hopefully explained in comment). Fixes https://github.com/vector-im/riot-web/issues/11763 --- src/client.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/client.js b/src/client.js index 3503530b7..00cf2824d 100644 --- a/src/client.js +++ b/src/client.js @@ -1505,8 +1505,11 @@ MatrixClient.prototype.createKeyBackupVersion = async function(info) { // favour of just signing with the cross-singing master key. await this._crypto._signObject(data.auth_data); - if (this._crypto._crossSigningInfo.getId()) { + if (this._cryptoCallbacks.getSecretStorageKey && this._crypto._crossSigningInfo.getId()) { // now also sign the auth data with the cross-signing master key + // we check for the callback explicitly here because we still want to be able + // to create an un-cross-signed key backup if there is a cross-signing key but + // no callback supplied. await this._crypto._crossSigningInfo.signObject(data.auth_data, "master"); }