Skip to content
This repository has been archived by the owner on Apr 12, 2022. It is now read-only.

Fix / don't error if we don't know about some keys #467

Merged
merged 2 commits into from
Jun 17, 2019
Merged

Fix / don't error if we don't know about some keys #467

merged 2 commits into from
Jun 17, 2019

Conversation

BillCarsonFr
Copy link
Member

Fixes element-hq/riot-android#3184

This is needed for compatibility with cross-signing, because with cross-signing, the client will be asked to verify the cross-signing key, but current clients don't know how to do that, so they should just ignore it rather than failing.

@BillCarsonFr BillCarsonFr requested a review from bmarty June 11, 2019 09:52
bmarty
bmarty approved these changes Jun 17, 2019
View reviewed changes
Copy link
Contributor

@bmarty bmarty left a comment

Choose a reason for hiding this comment

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

LGTM

@bmarty bmarty merged commit 790ba3e into develop Jun 17, 2019
@bmarty bmarty deleted the feature/sas_fix_xsigning branch June 17, 2019 08:31
@manuroe manuroe mentioned this pull request Jun 17, 2019
Closed
33 tasks
bmarty added a commit to element-hq/element-android that referenced this pull request Jun 17, 2019
@bmarty
SAS: import change from matrix-org/matrix-android-sdk#467
5cf6d61
@bmarty bmarty mentioned this pull request Jun 17, 2019
Merged
bmarty added a commit to element-hq/element-android that referenced this pull request Jun 17, 2019
@bmarty
SAS: import change from matrix-org/matrix-android-sdk#467
0497d14
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@bmarty bmarty bmarty approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

verification: don't error if we don't know about some keys
2 participants
@BillCarsonFr @bmarty