Feature/bca/fix 5906 #5939
Merged
Feature/bca/fix 5906 #5939
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
BillCarsonFr
requested review from
a team,
yostyle and
ariskotsomitopoulos
and removed request for
a team
bmarty
reviewed
May 5, 2022
...android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/CrossSigningOlm.kt
Show resolved
Hide resolved
ariskotsomitopoulos
approved these changes
May 10, 2022
...android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/CrossSigningOlm.kt
Outdated
Show resolved
Hide resolved
.../src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupManageActivity.kt
Outdated
Show resolved
Hide resolved
...m/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsRecyclerViewController.kt
Show resolved
Hide resolved
...c/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsViewModel.kt
Outdated
Show resolved
Hide resolved
vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageViewModel.kt
Show resolved
Hide resolved
BillCarsonFr
force-pushed
the
feature/bca/fix_5906
branch
from
e988804
to
da1fbb4
Compare
BillCarsonFr
force-pushed
the
feature/bca/fix_5906
branch
from
3eb8e42
to
8077406
Compare
|
This may fix some of the crypto integration tests that are going to be ignored in #6025 - will wait for this to merge before deciding the final set of tests to ignore. |
Matrix SDKIntegration Tests Results:
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #5906
Fixes #1260
Fixes #3368
Type of change
Content
Change to keep 4S in sync with megolm backup:
If 4S is setup and you try to delete then create a new megolm backup, you will now be prompted to enter the 4S passphrase. A new random key will be generated for the backup and will be then saved in the 4S (replacing the old one), and will also be saved locally for gossiping.
Code Change => The
SharedSecureStorageActivityhas been modified to support 2 modes now, read and write. So all the code to request the password/key is the same. In the write mode you can now pass a secretName/Value to be stored.Sign & Verify backup using MSK signature.
When the backup is created we now also add the MSK signature if possible (cross signing enabled and we have private part).
The signature is also checked in order to trust the backup .
Code Change =>
KeysBackupVersionTrustSignatureis changed to a sealed class ofDeviceSignatureorUserSignatureThe backup settings screens have been modified to show the new signatures.
A new class
CrossSigningOlmhas been extracted (session scope) and holds the olmPkSigning objects than can be then injected in both CrossSigningService and KeyBackupServiceScreenshots / GIFs
Tests
See step to reproduce from #5906
Unit test has been updated to check signatures
Tested devices
Checklist