657e48de7e
Fix grammar
2019-12-11 10:51:12 +00:00
1b63cb1406
Merge remote-tracking branch 'origin/develop' into jryans/4s-new-key-backup
2019-12-11 10:09:29 +00:00
9b8b57d186
Convert randomstring to typescript as a proof of concept
2019-12-10 11:50:01 -07:00
780394b051
Merge remote-tracking branch 'origin/develop' into jryans/4s-new-key-backup
2019-12-10 17:54:02 +00:00
6942e3467b
Rework to hold cross-signing keys in JS SDK as needed
2019-12-10 17:36:35 +00:00
70eb8a7300
Merge pull request #1100 from matrix-org/t3chguy/remove_bluebird_13
...
Remove Bluebird: phase 2.5
2019-12-10 16:58:22 +00:00
49f0e368d0
Merge pull request #1104 from matrix-org/uhoreg/ignore_verification_done
...
ignore m.key.verification.done messages when we don't expect any more messages
2019-12-10 09:27:22 -05:00
202fec2a35
dont cancel on remote echo of own .request event
2019-12-10 14:35:17 +01:00
110c9800f0
Merge branches 't3chguy/remove_bluebird_12' and 't3chguy/remove_bluebird_13' of github.com:matrix-org/matrix-js-sdk into t3chguy/remove_bluebird_12
2019-12-10 00:19:03 +00:00
1a6dc973bb
Merge branches 'develop' and 't3chguy/remove_bluebird_13' of github.com:matrix-org/matrix-js-sdk into t3chguy/remove_bluebird_13
2019-12-10 00:18:32 +00:00
44dd674dab
Note about static potential
2019-12-09 17:57:24 +00:00
4a3ce640d7
Document verification methods accepts cross-signing key ID as well
2019-12-09 17:20:54 +00:00
e5dcc5a407
use verification request with channel from crypto
2019-12-09 17:45:01 +01:00
1ee8abb0e6
wrap channel passed to verifier to nofity request
...
so request is notified when verifier sends an event
2019-12-09 17:45:01 +01:00
dd40435425
make verifier use channel instead of client straight away
...
so it is agnostic of the channel used
2019-12-09 17:45:01 +01:00
74cb57c761
extract DM verification specific things into InRoomChannel
2019-12-09 17:45:01 +01:00
86123f28f7
extract to_device verification specific things into ToDeviceChannel
2019-12-09 17:45:01 +01:00
f97ab32e7c
extract common logic between normal & DM verif into single request class
2019-12-09 17:45:01 +01:00
2a2a40af7a
Add separate check for secret storage keys
...
Decryption vs. signing keys are calculated differently and so require separate
check functions.
2019-12-06 17:51:22 +00:00
1df12d1677
Fix type docs for checkPrivateKey
2019-12-06 14:41:29 +00:00
14a2d7e860
Add docs for more exported cross-signing APIs
2019-12-06 13:20:57 +00:00
3f2c05664f
More unstable notices
2019-12-06 13:13:20 +00:00
9b05d1d68e
Merge remote-tracking branch 'origin/develop' into jryans/4s-new-key-backup
2019-12-06 12:08:33 +00:00
772d668389
Merge pull request #1105 from matrix-org/jryans/xs-dl-storage
...
Fix device list's cross-signing storage path
2019-12-06 12:06:49 +00:00
03360a663e
Fix device list's cross-signing storage path
...
Some variables were changed during the course of the initial cross-signing PR
(https://github.com/matrix-org/matrix-js-sdk/pull/832 ) without updating the
storage path to match, so we weren't storing / loading cross-signing info for
devices in the end.
This updates storage and loading to match where the data now lives in memory.
2019-12-06 11:59:17 +00:00
e1e9f690c9
ignore m.key.verification.done messages when we don't expect any more messages
2019-12-05 12:53:59 -05:00
934e81d16c
Clarify the key backup integration is unfinished
2019-12-05 16:36:17 +00:00
88bb31d3e6
Expose deriveKey from passphrase
2019-12-05 16:30:10 +00:00
33f5894547
Adjust secret key adding to consume instead of create
...
This changes `addKey` for secret storage to consume info about a pre-generated
key, rather than creating the key in middle of the method. This eases UI work
that want to have the public and private keys earlier on in the flow.
2019-12-05 16:30:10 +00:00
65f8556ee9
Include KDF params in recovery key info
...
This adjusts the metadata from `createRecoveryKeyFromPassphrase` to include KDF
info formatted in the way secret storage expects. Since
`prepareKeyBackupVersion` did something similar, we adjust it to use the new
function and reshape the objects.
2019-12-05 10:25:24 +00:00
eaaeedbb37
Merge branches 'develop' and 't3chguy/remove_bluebird_12' of github.com:matrix-org/matrix-js-sdk into t3chguy/remove_bluebird_12
2019-12-04 23:44:04 +00:00
4a47867e49
Down to two test failures
2019-12-04 19:17:58 +00:00
5fced642fa
Allow getSecretStorageKey to be async
2019-12-04 17:30:27 +00:00
9fb559307b
Add recovery key generation path
2019-12-04 15:32:22 +00:00
96c8c2b9c3
Test for cross-signing private key as well as public
2019-12-04 15:16:38 +00:00
145cdf6985
Remove extra space
2019-12-04 14:59:39 +00:00
5910fd95ff
Treat secret as not stored if its key info is missing
2019-12-04 14:23:47 +00:00
c0dbf2df7f
Publicise method testing for secret storage key existence
2019-12-04 14:23:47 +00:00
eeffe208ec
Clarify client-level method for adding secret storage keys
2019-12-04 13:45:56 +00:00
9dc61faa6f
Add bootstrap option to specify storage key
2019-12-04 11:36:25 +00:00
0dead73837
Update alias handling
...
Fixes https://github.com/vector-im/riot-web/issues/11551
2019-12-03 12:29:50 -07:00
66a6dd1f0c
Switch to Node compatible base64 handling
2019-12-03 18:01:45 +00:00
8a8109272a
fix undef3
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2019-12-02 23:45:12 +00:00
7ea30c449e
Merge branch 't3chguy/remove_bluebird_13' of github.com:matrix-org/matrix-js-sdk into t3chguy/remove_bluebird_13
2019-12-02 23:43:32 +00:00
a6e4096773
fix
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2019-12-02 23:43:06 +00:00
c1e2d646b6
undo remove
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2019-12-02 23:42:10 +00:00
710ac6847d
fix undef2
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2019-12-02 23:39:47 +00:00
f0267eae36
fix undef
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2019-12-02 23:38:55 +00:00
053bc49738
simplify promiseTry
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2019-12-02 22:55:05 +00:00
3a1de9fbdc
Rip out more bluebirds AGAIN
2019-12-02 22:34:46 +00:00
J. Ryan Stinnett