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

Untangle cross-signing and secret storage #1450

Merged
merged 12 commits into from
Aug 28, 2020

Conversation

jryans
Copy link
Collaborator

@jryans jryans commented Aug 27, 2020

This untangles cross-signing and secret storage setup into separate path that
can be invoked independently. There is no functional change with this patch, but
instead this just separates one giant monster API into two.

Part of element-hq/element-web#13895
Used by matrix-org/matrix-react-sdk#5149

As part of changing 4S to symmetric encryption, we no longer sign the 4S key
with the cross-signing MSK.
This untangles cross-signing and secret storage setup into separate path that
can be invoked independently. There is no functional change with this patch, but
instead this just separates one giant monster API into two.

Part of element-hq/element-web#13895
Copy link
Member

@dbkr dbkr left a comment

Choose a reason for hiding this comment

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

otherwise looks very plausible!

src/crypto/index.js Outdated Show resolved Hide resolved
src/crypto/index.js Show resolved Hide resolved
If we're resetting keys, we have to check that branch first.
This is useful when e.g. resetting both secret storage and cross-signing
together, as it avoids prompting for the secret storage key that was just
created.
@jryans jryans requested a review from dbkr August 28, 2020 11:12
Copy link
Member

@dbkr dbkr left a comment

Choose a reason for hiding this comment

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

lgtm!

@jryans jryans merged commit a51c045 into develop Aug 28, 2020
@t3chguy t3chguy deleted the jryans/defer-cross-signing-setup branch May 10, 2022 14:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants