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.

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

Sign backup with cross-signing key when we reset it. #2170

Merged
merged 1 commit into from
Feb 11, 2022

Conversation

uhoreg
Copy link
Member

@uhoreg uhoreg commented Feb 10, 2022

When we reset the key backup, enable it right away. This ensures that we remember it if bootstrapCrossSigning gets called, so that the auth_data gets signed by the master key, if a new key is created. Without this change, this.backupManager.backupInfo won't get set until some time after bootstrapCrossSigning is called, so it will think that there's no backup, and the auth_data will not get signed by the new master key.


Here's what your changelog entry will look like:

🐛 Bug Fixes

  • Sign backup with cross-signing key when we reset it. (#2170).

This ensures that we remember it if bootstrapCrossSigning gets called, so that
the authData gets signed by the master key, if a new key is created.
@uhoreg uhoreg requested a review from a team as a code owner February 10, 2022 22:14
@uhoreg uhoreg changed the title Enable key backup after we reset it. Sign backup with cross-signing key when we reset it. Feb 10, 2022
@uhoreg uhoreg merged commit cfad8d3 into matrix-org:develop Feb 11, 2022
t3chguy added a commit that referenced this pull request Feb 14, 2022
su-ex added a commit to SchildiChat/matrix-js-sdk that referenced this pull request Mar 5, 2022
* Return send event response from MSC3089Branch.createNewVersion() ([\matrix-org#2186](matrix-org#2186)).
* Add functions to support refresh tokens ([\matrix-org#2178](matrix-org#2178)).
* [Release] Fix bug with the /hierarchy API sending invalid requests ([\matrix-org#2202](matrix-org#2202)).
* Fix bug where calls could break if rejected from somewhere else ([\matrix-org#2189](matrix-org#2189)).
* Fix camera stuck on after call transfer ([\matrix-org#2188](matrix-org#2188)).
* Fix synthetic read receipt handling ([\matrix-org#2174](matrix-org#2174)). Fixes element-hq/element-web#21016.
* Revert "Sign backup with cross-signing key when we reset it." ([\matrix-org#2175](matrix-org#2175)).
* Sign backup with cross-signing key when we reset it. ([\matrix-org#2170](matrix-org#2170)).
* Fix error in uploadContent() when file is empty under Node.js ([\matrix-org#2155](matrix-org#2155)).
* Check the backup info against the stored private key when determining trust. ([\matrix-org#2167](matrix-org#2167)).
* Back up keys before logging out ([\matrix-org#2158](matrix-org#2158)). Fixes element-hq/element-web#13151.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants