Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable key upload to backups where we have the decryption key #4677

Open
wants to merge 11 commits into
base: develop
Choose a base branch
from
Open

Enable key upload to backups where we have the decryption key #4677

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
4443c3e
disable key backup when both trust via signatures and private key fail
ajbura Feb 3, 2025
2737071
test for enabling backup with decryption key
ajbura Feb 4, 2025
9ee08b1
enable backup with decryption key in legacy crypto
ajbura Feb 4, 2025
7b75d5f
fix formmating
ajbura Feb 4, 2025
a518470
fix typo
ajbura Feb 4, 2025
e678c08
add local variable for backup trust in legacy crypto
ajbura Feb 4, 2025
5ac44be
Update spec/integ/crypto/megolm-backup.spec.ts
ajbura Feb 4, 2025
e71dfe5
Update spec/integ/crypto/megolm-backup.spec.ts
ajbura Feb 4, 2025
168e45c
Update spec/integ/crypto/megolm-backup.spec.ts
ajbura Feb 4, 2025
6459c3b
Update src/rust-crypto/backup.ts
ajbura Feb 4, 2025
923c120
fix white space formatting
ajbura Feb 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/rust-crypto/backup.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ export class RustBackupManager extends TypedEventEmitter<RustBackupCryptoEvents,

const trustInfo = await this.isKeyBackupTrusted(backupInfo);

if (!trustInfo.trusted) {
if (!trustInfo.matchesDecryptionKey && !trustInfo.trusted) {
ajbura marked this conversation as resolved.
Show resolved Hide resolved
if (activeVersion !== null) {
logger.log("Key backup present on server but not trusted: disabling key backup");
await this.disableKeyBackup();
Expand Down
Loading