Commit Graph

  • 8a2d6a4450 tarpaulin: Disable tarpaulin debugging. Damir Jelić 2020-08-11 10:55:10 +02:00
  • c15ffb989a crypto: Remove an unused import. Damir Jelić 2020-08-11 09:48:01 +02:00
  • 2b78f05aad crypto: More SAS tests. Damir Jelić 2020-08-11 09:28:28 +02:00
  • 1f0a96e31d crypto: Disable the SAS timeout test on macOS. Damir Jelić 2020-08-10 17:26:15 +02:00
  • 6593cce778 crypto: Simplify the Instant substraction. Damir Jelić 2020-08-10 16:53:15 +02:00
  • d7bcf42a2b crypto: False alarm with the deadlock we just didn't use the right method. Damir Jelić 2020-08-10 16:18:20 +02:00
  • 18b655f829 crypto: Test the cancellation of timed out verifications. Damir Jelić 2020-08-10 15:55:08 +02:00
  • e2e70d6583 crypto: Cancel timed out verifications. Damir Jelić 2020-08-10 15:24:22 +02:00
  • c305b5052b matrix-sdk: Don't allow dead code anymore. Damir Jelić 2020-08-10 15:21:32 +02:00
  • 6f4d2022fd Merge branch 'master' into sas-timeout Damir Jelić 2020-08-10 15:00:08 +02:00
  • ef5201cf35 Merge branch 'up-ruma' into master Damir Jelić 2020-08-10 14:58:47 +02:00
  • 7bcdc2a3b6 Merge branch 'master' into sas-timeout Damir Jelić 2020-08-10 14:57:32 +02:00
  • 7eeff64059 crypto: Cancel timed out events on the state transitions. Damir Jelić 2020-08-10 14:29:38 +02:00
  • 9c4229dc57 typoes Matthew Hodgson 2020-08-10 13:15:49 +01:00
  • 6c4e2fa508 crypto: Remove mutable borrows in the tests. Damir Jelić 2020-08-10 14:15:47 +02:00
  • d5cd608045 base: Remove some unnecessary mutable borrows of the olm machine. Damir Jelić 2020-08-10 14:11:55 +02:00
  • d83fc971ce Update ruma Jonas Platte 2020-08-10 12:39:00 +02:00
  • d96142b8cb Merge branch 'master' into sas-timeout Damir Jelić 2020-08-10 13:48:02 +02:00
  • cd5d5da06a matrix-sdk: Use the upstream git repo for olm-rs. Damir Jelić 2020-08-10 13:43:18 +02:00
  • 87bcba3561 crypto: Add timestamps to the SAS struct so we can check if it timed out. Damir Jelić 2020-08-10 13:30:12 +02:00
  • 81e9a7cefc crypto: Pass a String when setting the other SAS pubkey. Damir Jelić 2020-08-10 10:18:57 +02:00
  • 3ddb2199d2 Merge branch 'fix-http-headers' into master Damir Jelić 2020-08-09 10:25:15 +02:00
  • 4abab73462 Update reqwest to a git dependency Jonas Platte 2020-08-08 16:15:22 +02:00
  • 17fd85d687 matrix-sdk: Test that we're passing the auth token in the headers. Damir Jelić 2020-08-08 15:00:28 +02:00
  • 279e88d9f9 Fix handling of headers in HttpClient Jonas Platte 2020-08-08 12:20:44 +02:00
  • d016ce1848 Use identifier macros in tests Jonas Platte 2020-08-05 00:56:26 +02:00
  • 591388d13e Upgrade ruma Jonas Platte 2020-07-31 20:35:27 +02:00
  • a3b4cab22e matrix_sdk_crypto: Fix clippy warnings add wasm emscripten to .gitignore Devin Ragotzy 2020-08-04 17:42:24 -04:00
  • ffdb9c4a79 Fix failing wasm test and clippy warnings for wasm Devin Ragotzy 2020-08-04 17:39:25 -04:00
  • cb8d5ce8fb Rename CustomOrRawEvent -> CustomEvent and use raw json when failed Devin Ragotzy 2020-08-04 15:08:13 -04:00
  • c10120602a Add test actually testing a correct message edit event Devin Ragotzy 2020-08-03 19:56:15 -04:00
  • 47690bd268 Bump ruma and fix failing unrecognized_event test Devin Ragotzy 2020-08-03 19:53:44 -04:00
  • 807432b31f crypto: Calculate the correct extra info when generating emojis. Damir Jelić 2020-08-04 13:54:00 +02:00
  • 69d2a00759 crypto: Add a TODO about SAS timing out. Damir Jelić 2020-08-04 12:56:55 +02:00
  • be01ee2de0 crypto: Cancel the verification if we find a MAC mismatch. Damir Jelić 2020-08-04 12:31:56 +02:00
  • 408fe5da4b crypto: Check that the other device had a valid MAC. Damir Jelić 2020-08-04 12:14:19 +02:00
  • 28a7831ffd matrix-sdk: Fix the import for the no-encryption case. Damir Jelić 2020-08-04 11:41:20 +02:00
  • 2bf8c99dfe Merge branch 'master' into sas-verification Damir Jelić 2020-08-04 11:23:24 +02:00
  • 77f0676a58 matrix-sdk: The emoji example requires the encryption feature. Damir Jelić 2020-08-04 10:49:08 +02:00
  • e7b2a54e46 matrix-sdk: Add a tarpaulin config. Damir Jelić 2020-08-04 10:40:13 +02:00
  • 33e1601004 matrix_sdk: Fix import error Devin Ragotzy 2020-08-03 20:13:58 -04:00
  • 26ec0c6368 crypto: Proptest the emoji/decimal calculation. Damir Jelić 2020-08-03 17:22:44 +02:00
  • 9f0fbcccf6 crypto: Remove verification objects that are done or canceled. Damir Jelić 2020-08-03 16:18:35 +02:00
  • 01ba94c670 matrix-sdk: Hide the cryptostore error behind a feature flag. Damir Jelić 2020-08-03 15:40:39 +02:00
  • e431ba0bf5 crypto: Fix some clippy warnings. Damir Jelić 2020-08-03 15:05:19 +02:00
  • a3bb8a0d74 examples: Don't use a proxy for the emoji example. Damir Jelić 2020-08-03 14:59:03 +02:00
  • 3245fbb1c9 examples: Clean up the emoji example a bit. Damir Jelić 2020-08-03 14:51:45 +02:00
  • f4517c150c crypto: Add more log lines to the SAS code. Damir Jelić 2020-08-03 14:51:04 +02:00
  • e37229554b crypto: Make sure that we don't hold on to a mutex guard over an await. Damir Jelić 2020-08-03 14:49:33 +02:00
  • df9da7539a crypto: Expose some more SAS info publicly. Damir Jelić 2020-08-03 14:33:15 +02:00
  • 1787d2ebe6 crypto: Hook up marking the device as verified. Damir Jelić 2020-08-03 12:38:43 +02:00
  • faadb4953b Revert "common: Switch to the ruma git repo." Damir Jelić 2020-08-03 10:22:17 +02:00
  • 021193087d common: Switch to the ruma git repo. Damir Jelić 2020-08-03 10:04:09 +02:00
  • 0ac2b84c02 Unify import style across workspace Devin Ragotzy 2020-08-02 08:05:43 -04:00
  • 230b2a229f matrix_sdk: Remove clippy allows Devin Ragotzy 2020-07-30 20:05:49 -04:00
  • ed1f12ce37 Run cargo fmt with merge-imports true Devin Ragotzy 2020-07-30 19:22:48 -04:00
  • 3f83941d57 Merge branch 'master' into sas-verification Damir Jelić 2020-07-31 16:27:52 +02:00
  • 91d7a8329e matrix-sdk: Add an example that does SAS verification. Damir Jelić 2020-07-31 15:34:46 +02:00
  • 1a40491c0b matrix-sdk: Fix some clippy warnings. Damir Jelić 2020-07-31 15:18:03 +02:00
  • 79e661d1d9 sdk-base: Remove MessageWrapper and do not order messages in queue Devin Ragotzy 2020-07-31 09:15:18 -04:00
  • dce06d31aa Merge branch 'master' into sas-verification Damir Jelić 2020-07-31 15:14:05 +02:00
  • 3472614649 Merge branch 'remove-possibly-redacted-type-alias' into master Damir Jelić 2020-07-31 15:13:23 +02:00
  • 7ecd4a035f crypto: Split out the Sas logic into different files. Damir Jelić 2020-07-31 14:54:08 +02:00
  • 2ce0765206 Remove confusing type alias for AnyPossiblyRedactedSyncMessageEvent. Denis Kasak 2020-07-31 14:21:00 +02:00
  • 108f6d90c9 matrix-sdk-common: Depend on our local Ruma branch. Damir Jelić 2020-07-31 12:29:08 +02:00
  • 7ceda2f39c crypto: Update to the latest Ruma changes. Damir Jelić 2020-07-31 12:05:07 +02:00
  • e00e94c6c3 Fix input order. Denis Kasak 2020-07-31 11:46:52 +02:00
  • a71c7b2964 crypto: Add a method to set the verification state of devices. Damir Jelić 2020-07-30 15:54:56 +02:00
  • 30c07b4e08 matrix-sdk: Send out to-device events in the sync_forever() loop. Damir Jelić 2020-07-30 15:53:55 +02:00
  • d9fbc18777 crypto: Update to the latest Ruma changes. Damir Jelić 2020-07-30 15:48:13 +02:00
  • a58ace70a7 crypto: Fix the SAS MAC calculation KEYIDS -> KEY_IDS. Damir Jelić 2020-07-30 15:45:19 +02:00
  • 359c5280d7 Expose sender in PossiblyRedactedExt. Denis Kasak 2020-07-30 14:40:27 +02:00
  • a07767d417 base: Hide the SAS getting method behind the encryption feature. Damir Jelić 2020-07-30 11:50:42 +02:00
  • 5a58fdff98 cyrpto: Fix a clippy warning. Damir Jelić 2020-07-29 14:50:39 +02:00
  • 5058f09111 matrix-sdk: Remove an incorrect copyright line. Damir Jelić 2020-07-29 14:40:05 +02:00
  • 21b0afe72c matrix-sdk: Add a Sas wrapper. Damir Jelić 2020-07-29 14:19:47 +02:00
  • a726ebab39 crypto: Allow Sas objects to be canceled. Damir Jelić 2020-07-29 13:53:33 +02:00
  • 2b124d98bc matrix-sdk: Pass the rwlock to the http client when doing requests. Damir Jelić 2020-07-29 13:50:01 +02:00
  • 4634efc092 crypto: More SAS content to to-device request logic. Damir Jelić 2020-07-29 13:23:03 +02:00
  • 117ebeaf4b crypto: Return requests when you want to accept a verification. Damir Jelić 2020-07-29 12:47:36 +02:00
  • 27f918e52d matris-sdk: Move the http request sending logic into a separate struct. Damir Jelić 2020-07-29 10:56:18 +02:00
  • 9facd86d81 base: Expose the verification methods in the base client. Damir Jelić 2020-07-28 16:44:06 +02:00
  • 7f2df68d62 crypto: Expose some SAS methods publicly. Damir Jelić 2020-07-28 16:24:45 +02:00
  • a6fa9f99fd crypto: Hook up the verification machine. Damir Jelić 2020-07-28 15:37:20 +02:00
  • 7e95d85f17 crypto: Move the cryptostore behind a lock. Damir Jelić 2020-07-28 15:03:44 +02:00
  • 57b65ec8c4 crypto: Add a verification machine. Damir Jelić 2020-07-28 14:45:53 +02:00
  • 2d6fff7927 crypto: A bit of cleanup and docs. Damir Jelić 2020-07-28 11:29:13 +02:00
  • 792623f53d crypto: Fix a clippy warning. Damir Jelić 2020-07-27 15:57:30 +02:00
  • 6e67585bf6 crypto: Handle all the cancel states. Damir Jelić 2020-07-27 15:56:28 +02:00
  • 5471c07244 crypto: More canceling. Damir Jelić 2020-07-27 15:34:18 +02:00
  • 0b04f7960b crypto: Add more checks and cancels in the SAS state machine. Damir Jelić 2020-07-27 15:28:14 +02:00
  • 623f91733e crypto: More verification canceling. Damir Jelić 2020-07-27 13:18:00 +02:00
  • da3734ffc7 crypto: Add initial SAS canceling. Damir Jelić 2020-07-27 13:16:56 +02:00
  • 7128505768 Merge branch 'master' into sas-verification Damir Jelić 2020-07-26 21:20:53 +02:00
  • 6a96368048 Upgrade ruma Jonas Platte 2020-07-26 16:58:27 +02:00
  • 8c9c843bfc crypto: Fix a comment in the sas file. Damir Jelić 2020-07-25 10:59:20 +02:00
  • 094b2f90d6 Merge branch 'master' into sas-verification Damir Jelić 2020-07-25 10:31:20 +02:00
  • 2cbdca1f58 crypto: Make it easier to create canceled SasState. Damir Jelić 2020-07-25 10:24:44 +02:00
  • d4fe2fe0a2 Remove redundant braces Jonas Platte 2020-07-25 02:32:50 +02:00
  • 14db34beee Use Option::and_then over manual match Jonas Platte 2020-07-25 02:32:18 +02:00