From 440274d6393a953ffd31f7b9045a9eca031dd822 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 18 Nov 2019 13:30:00 +0000
Subject: [PATCH] Fix local trust for key backups

https://github.com/matrix-org/matrix-js-sdk/pull/832 added
cross-signing checks for backup trust but we failed to merge in the
check for the the backup being trusted locally.

Fixes https://github.com/vector-im/riot-web/issues/11404
---
 src/crypto/index.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/crypto/index.js b/src/crypto/index.js
index 4b670d5a36f..440c92d015b 100644
--- a/src/crypto/index.js
+++ b/src/crypto/index.js
@@ -855,6 +855,7 @@ Crypto.prototype.isKeyBackupTrusted = async function(backupInfo) {
             )
         );
     });
+    ret.usable |= ret.trusted_locally;
     return ret;
 };