Damir Jelić
2b78f05aad
crypto: More SAS tests.
2020-08-11 09:28:28 +02:00
Damir Jelić
1f0a96e31d
crypto: Disable the SAS timeout test on macOS.
2020-08-10 17:26:15 +02:00
Damir Jelić
6593cce778
crypto: Simplify the Instant substraction.
2020-08-10 16:53:15 +02:00
Damir Jelić
d7bcf42a2b
crypto: False alarm with the deadlock we just didn't use the right method.
2020-08-10 16:18:20 +02:00
Damir Jelić
18b655f829
crypto: Test the cancellation of timed out verifications.
2020-08-10 15:55:08 +02:00
Damir Jelić
e2e70d6583
crypto: Cancel timed out verifications.
2020-08-10 15:24:22 +02:00
Damir Jelić
c305b5052b
matrix-sdk: Don't allow dead code anymore.
2020-08-10 15:23:49 +02:00
Damir Jelić
6f4d2022fd
Merge branch 'master' into sas-timeout
2020-08-10 15:00:08 +02:00
Damir Jelić
ef5201cf35
Merge branch 'up-ruma' into master
2020-08-10 14:58:47 +02:00
Damir Jelić
7bcdc2a3b6
Merge branch 'master' into sas-timeout
2020-08-10 14:57:32 +02:00
Damir Jelić
7eeff64059
crypto: Cancel timed out events on the state transitions.
2020-08-10 14:29:38 +02:00
Matthew Hodgson
9c4229dc57
typoes
2020-08-10 13:15:58 +01:00
Damir Jelić
6c4e2fa508
crypto: Remove mutable borrows in the tests.
2020-08-10 14:15:47 +02:00
Damir Jelić
d5cd608045
base: Remove some unnecessary mutable borrows of the olm machine.
2020-08-10 14:11:55 +02:00
Jonas Platte
d83fc971ce
Update ruma
2020-08-10 13:58:39 +02:00
Damir Jelić
d96142b8cb
Merge branch 'master' into sas-timeout
2020-08-10 13:48:02 +02:00
Damir Jelić
cd5d5da06a
matrix-sdk: Use the upstream git repo for olm-rs.
2020-08-10 13:43:18 +02:00
Damir Jelić
87bcba3561
crypto: Add timestamps to the SAS struct so we can check if it timed out.
2020-08-10 13:30:12 +02:00
Damir Jelić
81e9a7cefc
crypto: Pass a String when setting the other SAS pubkey.
2020-08-10 10:18:57 +02:00
Damir Jelić
3ddb2199d2
Merge branch 'fix-http-headers' into master
2020-08-09 10:25:15 +02:00
Jonas Platte
4abab73462
Update reqwest to a git dependency
2020-08-09 00:57:58 +02:00
Damir Jelić
17fd85d687
matrix-sdk: Test that we're passing the auth token in the headers.
2020-08-08 15:00:28 +02:00
Jonas Platte
279e88d9f9
Fix handling of headers in HttpClient
2020-08-08 12:23:43 +02:00
Jonas Platte
d016ce1848
Use identifier macros in tests
2020-08-06 13:03:32 +02:00
Jonas Platte
591388d13e
Upgrade ruma
2020-08-05 18:00:45 +02:00
Devin Ragotzy
a3b4cab22e
matrix_sdk_crypto: Fix clippy warnings add wasm emscripten to .gitignore
2020-08-04 20:02:09 -04:00
Devin Ragotzy
ffdb9c4a79
Fix failing wasm test and clippy warnings for wasm
2020-08-04 17:39:25 -04:00
Devin Ragotzy
cb8d5ce8fb
Rename CustomOrRawEvent -> CustomEvent and use raw json when failed
...
When deserialization fails we fallback to providing the user with a
serde_json::RawValue, basically the json string. Ruma should handle all
events that conform to a matrix event shape correctly by either
converting them to their type or returning a custom event.
2020-08-04 17:27:57 -04:00
Devin Ragotzy
c10120602a
Add test actually testing a correct message edit event
2020-08-04 17:22:54 -04:00
Devin Ragotzy
47690bd268
Bump ruma and fix failing unrecognized_event test
...
The test was broken because the JSON being fed into it was bad.
2020-08-04 17:22:54 -04:00
Damir Jelić
807432b31f
crypto: Calculate the correct extra info when generating emojis.
2020-08-04 13:54:00 +02:00
Damir Jelić
69d2a00759
crypto: Add a TODO about SAS timing out.
2020-08-04 12:56:55 +02:00
Damir Jelić
be01ee2de0
crypto: Cancel the verification if we find a MAC mismatch.
2020-08-04 12:31:56 +02:00
Damir Jelić
408fe5da4b
crypto: Check that the other device had a valid MAC.
2020-08-04 12:14:19 +02:00
Damir Jelić
28a7831ffd
matrix-sdk: Fix the import for the no-encryption case.
2020-08-04 11:41:20 +02:00
Damir Jelić
2bf8c99dfe
Merge branch 'master' into sas-verification
2020-08-04 11:23:24 +02:00
Damir Jelić
77f0676a58
matrix-sdk: The emoji example requires the encryption feature.
2020-08-04 10:49:08 +02:00
Damir Jelić
e7b2a54e46
matrix-sdk: Add a tarpaulin config.
2020-08-04 10:40:13 +02:00
Devin Ragotzy
33e1601004
matrix_sdk: Fix import error
2020-08-03 20:13:58 -04:00
Damir Jelić
26ec0c6368
crypto: Proptest the emoji/decimal calculation.
2020-08-03 17:22:44 +02:00
Damir Jelić
9f0fbcccf6
crypto: Remove verification objects that are done or canceled.
2020-08-03 16:18:35 +02:00
Damir Jelić
01ba94c670
matrix-sdk: Hide the cryptostore error behind a feature flag.
2020-08-03 15:40:39 +02:00
Damir Jelić
e431ba0bf5
crypto: Fix some clippy warnings.
2020-08-03 15:05:19 +02:00
Damir Jelić
a3bb8a0d74
examples: Don't use a proxy for the emoji example.
2020-08-03 14:59:03 +02:00
Damir Jelić
3245fbb1c9
examples: Clean up the emoji example a bit.
2020-08-03 14:51:45 +02:00
Damir Jelić
f4517c150c
crypto: Add more log lines to the SAS code.
2020-08-03 14:51:04 +02:00
Damir Jelić
e37229554b
crypto: Make sure that we don't hold on to a mutex guard over an await.
2020-08-03 14:49:33 +02:00
Damir Jelić
df9da7539a
crypto: Expose some more SAS info publicly.
2020-08-03 14:33:15 +02:00
Damir Jelić
1787d2ebe6
crypto: Hook up marking the device as verified.
2020-08-03 12:38:43 +02:00
Damir Jelić
faadb4953b
Revert "common: Switch to the ruma git repo."
...
This reverts commit 021193087d
2020-08-03 10:22:17 +02:00
