From faca8799dbc681b8c3455dfd67c1c6a2260665a7 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Wed, 3 Jun 2020 22:09:56 +0100 Subject: [PATCH 1/2] Add e2ee-default:false docs Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- docs/e2ee.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 docs/e2ee.md diff --git a/docs/e2ee.md b/docs/e2ee.md new file mode 100644 index 0000000000..c1882b3fcb --- /dev/null +++ b/docs/e2ee.md @@ -0,0 +1,16 @@ +# End to End encryption by default + +By default, Riot will create encrypted DM rooms if the user you are chatting with has keys uploaded on their account. +For private room creation Riot will default to encryption on but give you the choice to opt-out. + +## Disabling encryption by default + +Set the following on your homeserver's +`/.well-known/matrix/client` config: +```json +{ + "im.vector.riot.e2ee": { + "default": false + } +} +``` From bce0bf1b1d57827b7a23907829dcfc0b8722b84e Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Thu, 4 Jun 2020 12:38:45 +0100 Subject: [PATCH 2/2] Apply suggestions from code review Co-authored-by: J. Ryan Stinnett --- docs/e2ee.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/e2ee.md b/docs/e2ee.md index c1882b3fcb..38b1e9615c 100644 --- a/docs/e2ee.md +++ b/docs/e2ee.md @@ -1,7 +1,7 @@ -# End to End encryption by default +# End to end encryption by default By default, Riot will create encrypted DM rooms if the user you are chatting with has keys uploaded on their account. -For private room creation Riot will default to encryption on but give you the choice to opt-out. +For private room creation, Riot will default to encryption on but give you the choice to opt-out. ## Disabling encryption by default