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

Jump to bottom

Fix resetEncryption to remove secrets in 4S #4683

Merged
merged 5 commits into from
Feb 5, 2025
Merged

Fix resetEncryption to remove secrets in 4S #4683

merged 5 commits into from
Feb 5, 2025

Conversation

florianduros
Copy link
Contributor

@florianduros florianduros commented Feb 3, 2025 •
edited
Loading

Checklist

  • Tests written for new code (and old code if feasible).
  • New or updated public/exported symbols have accurate TSDoc documentation.
  • Linter and other CI checks pass.
  • Sign-off given on the changes (see CONTRIBUTING.md).

Issue https://github.com/matrix-org/internal-config/issues/1602

@florianduros
fix(crypto): resetEncryption remove secrets in 4S
19903f2 
Remove the cross signing keys and the backup decryption key of the 4S when calling `resetEncryption`
@florianduros florianduros force-pushed the florianduros/remove-secret-reset-encryption branch from 95e6b5e to c11f62e Compare February 4, 2025 08:47
@florianduros florianduros marked this pull request as ready for review February 4, 2025 16:24
@florianduros florianduros requested review from a team as code owners February 4, 2025 16:24
BillCarsonFr
BillCarsonFr approved these changes Feb 5, 2025
View reviewed changes
Copy link
Member

@BillCarsonFr BillCarsonFr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just a quick test to ensure the key marked as default is deleted

@florianduros florianduros added this pull request to the merge queue Feb 5, 2025
@florianduros florianduros removed this pull request from the merge queue due to a manual request Feb 5, 2025
@florianduros florianduros added this pull request to the merge queue Feb 5, 2025
Merged via the queue into develop with commit 6e72b35 Feb 5, 2025
30 checks passed
@florianduros florianduros deleted the florianduros/remove-secret-reset-encryption branch February 5, 2025 11:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dbkr dbkr dbkr approved these changes

@BillCarsonFr BillCarsonFr BillCarsonFr approved these changes

@uhoreg uhoreg Awaiting requested review from uhoreg uhoreg is a code owner automatically assigned from matrix-org/element-crypto-web-reviewers

@richvdh richvdh Awaiting requested review from richvdh richvdh is a code owner automatically assigned from matrix-org/element-crypto-web-reviewers

Assignees
No one assigned
Labels
T-Defect
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@florianduros @dbkr @BillCarsonFr