Manual key export / import with Crypto V2 #1608
Merged
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
Contributor
Anderas
commented
Oct 17, 2022
Anderas
commented
- Implement manual export / import of room keys via a file
- Implement export / import of cross signing keys
- Remove some old unused methods to export / import room keys without a passphrase
Anderas
force-pushed
the
andy/final_backups
branch
from
ed99001
to
75ccef5
Compare
Anderas
requested review from
a team and
aringenbach
and removed request for
a team
Anderas
force-pushed
the
andy/final_backups
branch
from
75ccef5
to
ca81a7b
Compare
Codecov ReportBase: 15.92% // Head: 25.92% // Increases project coverage by
Additional details and impacted files@@ Coverage Diff @@
## develop #1608 +/- ##
===========================================
+ Coverage 15.92% 25.92% +9.99%
===========================================
Files 575 575
Lines 91072 91037 -35
Branches 38407 39511 +1104
===========================================
+ Hits 14507 23604 +9097
+ Misses 76097 66670 -9427
- Partials 468 763 +295
Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. ☔ View full report at Codecov. |
Anderas
requested review from
a team and
alfogrillo
and removed request for
aringenbach and
a team
Anderas
force-pushed
the
andy/final_backups
branch
from
ca81a7b
to
a8e2a76
Compare
alfogrillo
approved these changes
Oct 24, 2022
| // MARK: - Manual export / import | ||
|
|
||
| func exportRoomKeys(passphrase: String) throws -> Data { | ||
| return try backup.exportRoomKeys(passphrase: passphrase) |
There was a problem hiding this comment.
Suggested change
| return try backup.exportRoomKeys(passphrase: passphrase) | |
| try backup.exportRoomKeys(passphrase: passphrase) |
| } | ||
|
|
||
| func importRoomKeys(_ data: Data, passphrase: String) throws -> KeysImportResult { | ||
| return try backup.importRoomKeys(data, passphrase: passphrase, progressListener: self) |
There was a problem hiding this comment.
Suggested change
| return try backup.importRoomKeys(data, passphrase: passphrase, progressListener: self) | |
| try backup.importRoomKeys(data, passphrase: passphrase, progressListener: self) |
| @@ -228,6 +231,14 @@ class CryptoBackupStub: MXCryptoBackup { | |||
| roomKeysSpy = roomKeys | |||
| return KeysImportResult(imported: Int64(roomKeys.count), total: Int64(roomKeys.count), keys: [:]) | |||
| } | |||
|
|
|||
| func exportRoomKeys(passphrase: String) throws -> Data { | |||
| return Data() | |||
There was a problem hiding this comment.
Suggested change
| return Data() | |
| .init() |
| } | ||
|
|
||
| func importRoomKeys(_ data: Data, passphrase: String, progressListener: ProgressListener) throws -> KeysImportResult { | ||
| return KeysImportResult(imported: 0, total: 0, keys: [:]) |
There was a problem hiding this comment.
Suggested change
| return KeysImportResult(imported: 0, total: 0, keys: [:]) | |
| .init(imported: 0, total: 0, keys: [:]) |
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.